beceem: fold unregister_netdevice into AdapterFree

The function unregister_netdevice only called unregister_netdev.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index 908711d0447d1bd3760a8a2a2dfb748e44c17552..e3575ad65e9156d9770e3f6331ab088de50c056b 100644 (file)
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -145,15 +145,6 @@ int register_networkdev(PMINI_ADAPTER Adapter)
        return result;
 }
 
-void bcm_unregister_networkdev(PMINI_ADAPTER Adapter)
-{
-       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Unregistering the Net Dev...\n");
-       if(Adapter->dev) {
-               unregister_netdev(Adapter->dev);
-               Adapter->dev = NULL;
-       }
-}
-
 static int bcm_init(void)
 {
        printk(KERN_INFO "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);

diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index ae9e88cf51fd99dbaec1ff8f4b71e2a37a066c9e..b982c7a6e9f2764f34d5d7d0f4405ff67a76564c 100644 (file)
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -125,7 +125,7 @@ VOID AdapterFree(PMINI_ADAPTER Adapter)
        if(Adapter->LEDInfo.led_thread_running & (BCM_LED_THREAD_RUNNING_ACTIVELY | BCM_LED_THREAD_RUNNING_INACTIVELY))
                kthread_stop (Adapter->LEDInfo.led_cntrl_threadid);
 
-       bcm_unregister_networkdev(Adapter);
+       unregister_netdev(Adapter->dev);
 
        /* FIXME: use proper wait_event and refcounting */
        while(atomic_read(&Adapter->ApplicationRunning))

diff --git a/drivers/staging/bcm/Prototypes.h b/drivers/staging/bcm/Prototypes.h
index 286ea46cd996df73b37798aba3297bbee211ddbb..8ca6b9eb4e34f9bbb4dd631916a8b19601dc3be1 100644 (file)
--- a/drivers/staging/bcm/Prototypes.h
+++ b/drivers/staging/bcm/Prototypes.h
@@ -122,8 +122,6 @@ void doPowerAutoCorrection(PMINI_ADAPTER psAdapter);
 
 int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo);
 
-void bcm_unregister_networkdev(PMINI_ADAPTER Adapter);
-
 int SearchVcid(PMINI_ADAPTER Adapter,unsigned short usVcid);
 
 void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter,