---

yaml --- r: 227911 b: refs/heads/master c: 26a0e39 h: refs/heads/master i: 227909: d5b886e 227907: 415daf2 227903: 61fb165 v: v3
git-mirror · Nov 1, 2010 · b417cb4 · b417cb4
1 parent ffe5c8c
commit b417cb4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7441698fe9eb0eb473cf1699d9cd8dd06dfeaf77
+refs/heads/master: 26a0e39ac8ed1f38b31baeb901bc76501466d34e
diff --git a/trunk/drivers/staging/bcm/Bcmnet.c b/trunk/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/trunk/drivers/staging/bcm/Misc.c b/trunk/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/trunk/drivers/staging/bcm/Prototypes.h b/trunk/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,