kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

beceem: fold unregister_netdevice into AdapterFree

Browse source 
The function unregister_netdevice only called unregister_netdev.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
This commit is contained in:
Stephen Hemminger 2010-10-31 23:47:35 -04:00
parent 7441698fe9
commit 26a0e39ac8
3 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/bcm/Bcmnet.c
View file

@ -145,15 +145,6 @@ int register_networkdev(PMINI_ADAPTER Adapter)
return result; 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) static int bcm_init(void)
{ {
printk(KERN_INFO "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION); printk(KERN_INFO "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);

2
drivers/staging/bcm/Misc.c
View file

@ -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)) if(Adapter->LEDInfo.led_thread_running & (BCM_LED_THREAD_RUNNING_ACTIVELY | BCM_LED_THREAD_RUNNING_INACTIVELY))
kthread_stop (Adapter->LEDInfo.led_cntrl_threadid); kthread_stop (Adapter->LEDInfo.led_cntrl_threadid);
bcm_unregister_networkdev(Adapter); unregister_netdev(Adapter->dev);
/* FIXME: use proper wait_event and refcounting */ /* FIXME: use proper wait_event and refcounting */
while(atomic_read(&Adapter->ApplicationRunning)) while(atomic_read(&Adapter->ApplicationRunning))

2
drivers/staging/bcm/Prototypes.h
View file

@ -122,8 +122,6 @@ void doPowerAutoCorrection(PMINI_ADAPTER psAdapter);
int bcm_ioctl_fw_download(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwInfo); 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); int SearchVcid(PMINI_ADAPTER Adapter,unsigned short usVcid);
void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter, void CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter,