Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b54dca authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: cleanup function prototypes in header files 



Several header files were specifying function prototypes although
no other module was relying on them. They have been moved to the
related source file and made static or removed if the functions
were non-existent in the driver.

Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b693380f

drivers/staging/brcm80211/brcmsmac/wl_export.h

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ extern uint wl_reset(struct wl_info *wl); 
extern void wl_intrson(struct wl_info *wl);

extern u32 wl_intrsoff(struct wl_info *wl);

extern void wl_intrsrestore(struct wl_info *wl, u32 macintmask);

extern void wl_event(struct wl_info *wl, char *ifname, wlc_event_t *e);

extern void wl_event_sendup(struct wl_info *wl, const wlc_event_t *e,

			    u8 *data, u32 len);

extern int wl_up(struct wl_info *wl);

extern void wl_down(struct wl_info *wl);

extern void wl_txflowcontrol(struct wl_info *wl, struct wl_if *wlif, bool state,

drivers/staging/brcm80211/brcmsmac/wl_mac80211.c

+11 −5
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ static int wl_start(struct sk_buff *skb, struct wl_info *wl); 
static int wl_start_int(struct wl_info *wl, struct ieee80211_hw *hw,

			struct sk_buff *skb);

static void wl_dpc(unsigned long data);

static irqreturn_t wl_isr(int irq, void *dev_id);



static int __devinit wl_pci_probe(struct pci_dev *pdev,

				  const struct pci_device_id *ent);

static void wl_remove(struct pci_dev *pdev);

static void wl_free(struct wl_info *wl);



MODULE_AUTHOR("Broadcom Corporation");

MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
@@ -93,8 +99,6 @@ static struct pci_device_id wl_id_table[] = { 
};



MODULE_DEVICE_TABLE(pci, wl_id_table);

static void wl_remove(struct pci_dev *pdev);





#ifdef BCMDBG

static int msglevel = 0xdeadbeef;
@@ -105,6 +109,8 @@ module_param(phymsglevel, int, 0); 


#define HW_TO_WL(hw)	 (hw->priv)

#define WL_TO_HW(wl)	  (wl->pub->ieee_hw)



/* MAC80211 callback functions */

static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb);

static int wl_ops_start(struct ieee80211_hw *hw);

static void wl_ops_stop(struct ieee80211_hw *hw);
@@ -1096,7 +1102,7 @@ static int ieee_hw_init(struct ieee80211_hw *hw) 
 *

 * Perimeter lock is initialized in the course of this function.

 */

int __devinit

static int __devinit

wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	int rc;
@@ -1334,7 +1340,7 @@ module_exit(wl_module_exit); 
 * precondition: can both be called locked and unlocked

 *

 */

void wl_free(struct wl_info *wl)

static void wl_free(struct wl_info *wl)

{

	wl_timer_t *t, *next;

	struct osl_info *osh;
@@ -1525,7 +1531,7 @@ void wl_down(struct wl_info *wl) 
	WL_LOCK(wl);

}



irqreturn_t BCMFASTPATH wl_isr(int irq, void *dev_id)

static irqreturn_t BCMFASTPATH wl_isr(int irq, void *dev_id)

{

	struct wl_info *wl;

	bool ours, wantdpc;

drivers/staging/brcm80211/brcmsmac/wl_mac80211.h

+0 −17
Original line number Diff line number Diff line
@@ -88,21 +88,4 @@ struct wl_info { 
#define INT_LOCK(wl, flags)	spin_lock_irqsave(&(wl)->isr_lock, flags)

#define INT_UNLOCK(wl, flags)	spin_unlock_irqrestore(&(wl)->isr_lock, flags)



#ifndef PCI_D0

#define PCI_D0		0

#endif



#ifndef PCI_D3hot

#define PCI_D3hot	3

#endif



/* exported functions */



extern irqreturn_t wl_isr(int irq, void *dev_id);



extern int __devinit wl_pci_probe(struct pci_dev *pdev,

				  const struct pci_device_id *ent);

extern void wl_free(struct wl_info *wl);

extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);



#endif				/* _wl_mac80211_h_ */

drivers/staging/brcm80211/brcmsmac/wlc_alloc.c

+4 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <wlc_alloc.h>

#include <wl_dbg.h>



static struct wlc_bsscfg *wlc_bsscfg_malloc(struct osl_info *osh, uint unit);

static void wlc_bsscfg_mfree(struct osl_info *osh, struct wlc_bsscfg *cfg);

static struct wlc_pub *wlc_pub_malloc(struct osl_info *osh, uint unit,

				      uint *err, uint devid);

static void wlc_pub_mfree(struct osl_info *osh, struct wlc_pub *pub);
@@ -114,7 +116,7 @@ static void wlc_pub_mfree(struct osl_info *osh, struct wlc_pub *pub) 
	kfree(pub);

}



wlc_bsscfg_t *wlc_bsscfg_malloc(struct osl_info *osh, uint unit)

static wlc_bsscfg_t *wlc_bsscfg_malloc(struct osl_info *osh, uint unit)

{

	wlc_bsscfg_t *cfg;
@@ -134,7 +136,7 @@ wlc_bsscfg_t *wlc_bsscfg_malloc(struct osl_info *osh, uint unit) 
	return NULL;

}



void wlc_bsscfg_mfree(struct osl_info *osh, wlc_bsscfg_t *cfg)

static void wlc_bsscfg_mfree(struct osl_info *osh, wlc_bsscfg_t *cfg)

{

	if (cfg == NULL)

		return;

drivers/staging/brcm80211/brcmsmac/wlc_alloc.h

+0 −4
Original line number Diff line number Diff line
@@ -19,7 +19,3 @@ extern void *wlc_calloc(struct osl_info *osh, uint unit, uint size); 
extern struct wlc_info *wlc_attach_malloc(struct osl_info *osh, uint unit,

					  uint *err, uint devid);

extern void wlc_detach_mfree(struct wlc_info *wlc, struct osl_info *osh);
 


struct wlc_bsscfg;

extern struct wlc_bsscfg *wlc_bsscfg_malloc(struct osl_info *osh, uint unit);

extern void wlc_bsscfg_mfree(struct osl_info *osh, struct wlc_bsscfg *cfg);