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

staging: brcm80211: #include reduction 



Code cleanup. Number of includes has been reduced by only including what
is necessary.

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f99f8a72

drivers/staging/brcm80211/brcmsmac/aiutils.c

+8 −15
Original line number Diff line number Diff line
@@ -13,26 +13,19 @@ 
 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include <linux/delay.h>

#include <linux/kernel.h>

#include <linux/string.h>

#include <defs.h>

#include "types.h"

#include <linux/module.h>

#include <linux/pci.h>

#include <brcmu_utils.h>

#include <aiutils.h>

#include <soc.h>



#include <defs.h>

#include <chipcommon.h>

#include <brcmu_utils.h>

#include <brcm_hw_ids.h>



/* ********** from siutils.c *********** */

#include <nicpci.h>

#include "types.h"

#include "pub.h"

#include "pmu.h"

#include "srom.h"

#include <pmu.h>

#include <scb.h>

#include <pub.h>

#include "nicpci.h"

#include "aiutils.h"



/* slow_clk_ctl */

#define SCC_SS_MASK		0x00000007	/* slow clock source mask */

drivers/staging/brcm80211/brcmsmac/alloc.c

+1 −12
Original line number Diff line number Diff line
@@ -13,23 +13,12 @@ 
 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include <linux/kernel.h>

#include <linux/types.h>



#include <defs.h>

#include <brcmu_utils.h>

#include <aiutils.h>

#include "dma.h"



#include "d11.h"

#include "types.h"

#include "scb.h"

#include "pub.h"

#include "alloc.h"

#include "rate.h"

#include "phy/phy_hal.h"

#include "channel.h"

#include "main.h"

#include "alloc.h"



static struct wlc_bsscfg *wlc_bsscfg_malloc(uint unit);

static void wlc_bsscfg_mfree(struct wlc_bsscfg *cfg);

drivers/staging/brcm80211/brcmsmac/ampdu.c

+0 −10
Original line number Diff line number Diff line
@@ -13,22 +13,12 @@ 
 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */

#include <linux/kernel.h>

#include <net/mac80211.h>



#include <defs.h>

#include <brcmu_utils.h>

#include <aiutils.h>

#include "dma.h"

#include <d11.h>



#include "types.h"

#include "rate.h"

#include "scb.h"

#include "pub.h"

#include "phy/phy_hal.h"

#include "antsel.h"

#include "channel.h"

#include "main.h"

#include "ampdu.h"

drivers/staging/brcm80211/brcmsmac/antsel.c

+5 −16
Original line number Diff line number Diff line
@@ -14,24 +14,13 @@ 
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/pci.h>



#include <defs.h>

#include <brcmu_utils.h>

#include <aiutils.h>

#include <brcm_hw_ids.h>

#include "dma.h"



#include "d11.h"

#include "rate.h"

#include "scb.h"

#include "pub.h"

#include "phy/phy_hal.h"

#include <linux/slab.h>

#include <net/mac80211.h>



#include "types.h"

#include "bmac.h"

#include "channel.h"

#include "main.h"

#include "phy_shim.h"

#include "antsel.h"



#define ANT_SELCFG_AUTO		0x80	/* bit indicates antenna sel AUTO */

drivers/staging/brcm80211/brcmsmac/bmac.c

+3 −22
Original line number Diff line number Diff line
@@ -13,39 +13,20 @@ 
 * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */





#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <net/mac80211.h>



#include <defs.h>

#include "types.h"

#include <brcm_hw_ids.h>

#include <brcmu_wifi.h>

#include <aiutils.h>

#include "srom.h"

#include "otp.h"

#include <brcmu_utils.h>

#include <chipcommon.h>

#include <nicpci.h>

#include "dma.h"



#include "types.h"

#include "pmu.h"

#include "d11.h"

#include "rate.h"

#include "scb.h"

#include "pub.h"

#include "phy/phy_hal.h"

#include "channel.h"

#include "main.h"

#include "ucode_loader.h"

#include "antsel.h"

#include "alloc.h"

#include "bmac.h"

#include "mac80211_if.h"

#include "bmac.h"



#define	TIMER_INTERVAL_WATCHDOG_BMAC	1000	/* watchdog timer, in unit of ms */