Commit c4daa849 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: fixed double #include problem 



Code cleanup. Removed one redundant include and reshuffled #include order as
to include Linux header files first.

Reported-by: default avatarjulie Sullivan <kernelmail.jms@gmail.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent af34b024

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+3 −4
Original line number Diff line number Diff line
@@ -19,15 +19,14 @@ 
#include <linux/netdevice.h>

#include <linux/pci_ids.h>

#include <linux/sched.h>



#include <defs.h>

#include <brcm_hw_ids.h>

#include <brcmu_utils.h>

#include <brcmu_wifi.h>

#include <soc.h>



#include <bcmsdbus.h>		/* common SDIO/controller interface */

#include <sbsdio.h>		/* BRCM sdio device core */



#include "bcmsdbus.h"		/* common SDIO/controller interface */

#include "sbsdio.h"		/* BRCM sdio device core */

#include "dngl_stats.h"

#include "dhd.h"

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+9 −11
Original line number Diff line number Diff line
@@ -16,22 +16,20 @@ 
#include <linux/types.h>

#include <linux/netdevice.h>

#include <linux/mmc/sdio.h>

#include <defs.h>

#include <brcm_hw_ids.h>

#include <brcmu_utils.h>

#include <brcmu_wifi.h>

#include "sdio_host.h"

#include <bcmsdbus.h>		/* bcmsdh to/from specific controller APIs */

#include <sdiovar.h>		/* ioctl/iovars */



#include <linux/mmc/core.h>

#include <linux/mmc/sdio_func.h>

#include <linux/mmc/sdio_ids.h>

#include <linux/suspend.h>



#include <dngl_stats.h>

#include <dhd.h>



#include <defs.h>

#include <brcm_hw_ids.h>

#include <brcmu_utils.h>

#include <brcmu_wifi.h>

#include "sdio_host.h"

#include "bcmsdbus.h"		/* bcmsdh to/from specific controller APIs */

#include "sdiovar.h"		/* ioctl/iovars */

#include "dngl_stats.h"

#include "dhd.h"

#include "bcmsdh_sdmmc.h"



extern int sdio_function_init(void);

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c

+9 −10
Original line number Diff line number Diff line
@@ -16,19 +16,18 @@ 
#include <linux/types.h>

#include <linux/sched.h>	/* request_irq() */

#include <linux/netdevice.h>

#include <net/cfg80211.h>

#include <defs.h>

#include <brcmu_utils.h>

#include <brcmu_wifi.h>

#include "sdio_host.h"

#include <bcmsdbus.h>		/* bcmsdh to/from specific controller APIs */

#include <sdiovar.h>		/* to get msglevel bit values */



#include <linux/mmc/core.h>

#include <linux/mmc/card.h>

#include <linux/mmc/sdio_func.h>

#include <linux/mmc/sdio_ids.h>

#include <net/cfg80211.h>



#include <defs.h>

#include <brcmu_utils.h>

#include <brcmu_wifi.h>

#include "sdio_host.h"

#include "bcmsdbus.h"		/* bcmsdh to/from specific controller APIs */

#include "sdiovar.h"		/* to get msglevel bit values */

#include "dngl_stats.h"

#include "dhd.h"
@@ -53,8 +52,8 @@ 


#include <bcmsdh_sdmmc.h>



#include <dhd_dbg.h>

#include <wl_cfg80211.h>

#include "dhd_dbg.h"

#include "wl_cfg80211.h"



extern void sdioh_sdmmc_devintr_off(sdioh_info_t *sd);

extern void sdioh_sdmmc_devintr_on(sdioh_info_t *sd);

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+5 −5
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ 
#include <brcmu_utils.h>

#include <brcmu_wifi.h>



#include <dngl_stats.h>

#include <dhd.h>

#include <dhd_proto.h>

#include <dhd_bus.h>

#include <dhd_dbg.h>

#include "dngl_stats.h"

#include "dhd.h"

#include "dhd_proto.h"

#include "dhd_bus.h"

#include "dhd_dbg.h"



struct cdc_ioctl {

	u32 cmd;	/* ioctl command value */

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+7 −7
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 
#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/sched.h>

#include <defs.h>

#include <brcmu_wifi.h>

#include <linux/netdevice.h>

#include <asm/unaligned.h>

#include <defs.h>

#include <brcmu_wifi.h>

#include <brcmu_utils.h>

#include <dngl_stats.h>

#include <dhd.h>

#include <dhd_bus.h>

#include <dhd_proto.h>

#include <dhd_dbg.h>

#include "dngl_stats.h"

#include "dhd.h"

#include "dhd_bus.h"

#include "dhd_proto.h"

#include "dhd_dbg.h"



#define BRCM_OUI		"\x00\x10\x18"

#define DOT11_OUI_LEN			3