diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-07 23:19:11 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-07 23:19:11 (GMT) |
| commit | c62add38420029de50d1e4c16795211d748dd08b (patch) | |
| tree | 17719d7bba24c2ea8b5b0180f20668ab40a6ac9b | |
| parent | 364eb72a3965ddf3291be74562081b1c19813473 (diff) | |
| download | linux-fsl-qoriq-c62add38420029de50d1e4c16795211d748dd08b.tar.xz | |
Staging: brcm80211: remove old module macro wrappers
they weren't doing anything, so get rid of them.
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 1 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/include/linuxver.h | 17 |
3 files changed, 0 insertions, 20 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 1441b33..75f4724 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -1787,7 +1787,6 @@ static int dhd_stop(struct net_device *net) __func__)); #endif /* !defined(IGNORE_ETH0_DOWN) */ - OLD_MOD_DEC_USE_COUNT; return 0; } @@ -1836,7 +1835,6 @@ static int dhd_open(struct net_device *net) } #endif - OLD_MOD_INC_USE_COUNT; return ret; } diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 11084cb..62f8e09 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -3129,7 +3129,6 @@ int32 wl_cfg80211_attach(struct net_device *ndev, void *data) ci = (struct wl_iface *)wl_to_ci(wl); ci->wl = wl; ndev->ieee80211_ptr = wdev; - SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy)); wdev->netdev = ndev; err = wl_init_priv(wl); if (unlikely(err)) { diff --git a/drivers/staging/brcm80211/include/linuxver.h b/drivers/staging/brcm80211/include/linuxver.h index 0f8d8af..4986b3b 100644 --- a/drivers/staging/brcm80211/include/linuxver.h +++ b/drivers/staging/brcm80211/include/linuxver.h @@ -63,23 +63,6 @@ typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs); #define PCI_SAVE_STATE(a, b) pci_save_state(a) #define PCI_RESTORE_STATE(a, b) pci_restore_state(a) -/* Module refcount handled internally in 2.6.x */ -#ifndef SET_MODULE_OWNER -#define SET_MODULE_OWNER(dev) do {} while (0) -#endif -#ifndef MOD_INC_USE_COUNT -#define MOD_INC_USE_COUNT do {} while (0) -#endif -#ifndef MOD_DEC_USE_COUNT -#define MOD_DEC_USE_COUNT do {} while (0) -#endif -#define OLD_MOD_INC_USE_COUNT MOD_INC_USE_COUNT -#define OLD_MOD_DEC_USE_COUNT MOD_DEC_USE_COUNT - -#ifndef SET_NETDEV_DEV -#define SET_NETDEV_DEV(net, pdev) do {} while (0) -#endif - #ifndef HAVE_FREE_NETDEV #define free_netdev(dev) kfree(dev) #endif |