Commit 26a0e39a authored Oct 31, 2010 by Stephen Hemminger

beceem: fold unregister_netdevice into AdapterFree



The function unregister_netdevice only called unregister_netdev.

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

parent 7441698f

drivers/staging/bcm/Bcmnet.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -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);

drivers/staging/bcm/Misc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

drivers/staging/bcm/Prototypes.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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,