From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 29 Oct 2010 15:18:27 +0000 (-0700)
Subject: beceem: eliminate network registered state variable
X-Git-Tag: firefly_0821_release~7613^2~3069^2~455^2^2~45
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d52db0b4b34410019e1546e3ccbe761b9e4ddd76;p=firefly-linux-kernel-4.4.55.git

beceem: eliminate network registered state variable

Just use presence of pointer

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

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index eebb77f9413e..055ff1cb39d9 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -599,7 +599,6 @@ struct _MINI_ADAPTER
 
 
 	struct semaphore	NVMRdmWrmLock;
-	BOOLEAN			bNetworkInterfaceRegistered;
 
 	struct device *pstCreatedClassDevice;
 	BOOLEAN			bUsbClassDriverRegistered;
diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index ce975d7f221f..4785d25874b9 100644
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -115,41 +115,21 @@ int register_networkdev(PMINI_ADAPTER Adapter)
 	ReadMacAddressFromNVM(Adapter);
 
 	result = register_netdev(Adapter->dev);
-	if (!result)
-	{
-		Adapter->bNetworkInterfaceRegistered = TRUE ;
-		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Beceem Network device name is %s!", Adapter->dev->name);
-	}
-	else
-	{
-    	BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Network device can not be registered!");
-		Adapter->bNetworkInterfaceRegistered = FALSE ;
-		return result;
+	if (!result) {
+		free_netdev(Adapter->dev);
+		Adapter->dev = NULL;
 	}
 
-#if 0
- Adapter->stDebugState.debug_level = DBG_LVL_CURR;
- Adapter->stDebugState.type =(UINT)0xffffffff;
- Adapter->stDebugState.subtype[DBG_TYPE_OTHERS] = 0xffffffff;
- Adapter->stDebugState.subtype[DBG_TYPE_RX] = 0xffffffff;
- Adapter->stDebugState.subtype[DBG_TYPE_TX] = 0xffffffff;
- Adapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0xffffffff;
-
- printk("-------ps_adapter->stDebugState.type=%x\n",Adapter->stDebugState.type);
- printk("-------ps_adapter->stDebugState.subtype[DBG_TYPE_OTHERS]=%x\n",Adapter->stDebugState.subtype[DBG_TYPE_OTHERS]);
- printk("-------ps_adapter->stDebugState.subtype[DBG_TYPE_RX]=%x\n",Adapter->stDebugState.subtype[DBG_TYPE_RX]);
- printk("-------ps_adapter->stDebugState.subtype[DBG_TYPE_TX]=%x\n",Adapter->stDebugState.subtype[DBG_TYPE_TX]);
-#endif
-
-	return 0;
+	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 && !IS_ERR(Adapter->dev) && Adapter->bNetworkInterfaceRegistered)
+	if(Adapter->dev) {
 		unregister_netdev(Adapter->dev);
-		/* Unregister the notifier block */
+		Adapter->dev = NULL;
+	}
 }
 
 static int bcm_init(void)