From 5fee254098c11a52ce04e1efdc8c090caf592bfd Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Tue, 14 Sep 2010 09:45:51 -0400 Subject: [PATCH] staging: brcm80211: fix remaining checkpatch errors. Remaining errors are due to the use of typedefs. They should dissappear once the typedefs get cleaned up. Signed-off-by: Jason Cooper Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/include/bcmutils.h | 6 +++--- drivers/staging/brcm80211/sys/wl_mac80211.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h index 67fe99cb5b9..321071b5372 100644 --- a/drivers/staging/brcm80211/include/bcmutils.h +++ b/drivers/staging/brcm80211/include/bcmutils.h @@ -415,15 +415,15 @@ extern "C" { } #ifndef ABS -#define ABS(a) (((a) < 0) ? -(a):(a)) +#define ABS(a) (((a) < 0) ? -(a) : (a)) #endif /* ABS */ #ifndef MIN -#define MIN(a, b) (((a) < (b)) ? (a):(b)) +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif /* MIN */ #ifndef MAX -#define MAX(a, b) (((a) > (b)) ? (a):(b)) +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) #endif /* MAX */ #define CEIL(x, y) (((x) + ((y)-1)) / (y)) diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index adcac6dddf9..71bd46383c1 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -1611,14 +1611,14 @@ static void __devexit wl_remove(struct pci_dev *pdev) } static struct pci_driver wl_pci_driver = { - name: "brcm80211", - probe: wl_pci_probe, + .name = "brcm80211", + .probe = wl_pci_probe, #ifdef LINUXSTA_PS - suspend: wl_suspend, - resume: wl_resume, + .suspend = wl_suspend, + .resume = wl_resume, #endif /* LINUXSTA_PS */ - remove: __devexit_p(wl_remove), - id_table: wl_id_table, + .remove = __devexit_p(wl_remove), + .id_table = wl_id_table, }; #endif /* !BCMSDIO */ -- 2.20.1