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>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 1441b3336997b6eb6cca537bba2ca96f1a7ea3c4..75f472411cd1ae18341243bf0996ebc16a26adc1 100644 (file)
--- 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 11084cbf30dc4961a9fa1ed96cf9daffc6451b56..62f8e09aaafae8c21a9b89f4ab2b5b633b86015e 100644 (file)
--- 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 0f8d8af3aa218e2b300175fa90e42fae2d4d7239..4986b3b8a540b1b094e80e33831f91638b81f997 100644 (file)
--- 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