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 eebb77f9413e8d64a89bc8541a524164c6b89e8b..055ff1cb39d96ffd4c58f8648b0f8fc038cbde91 100644 (file)
--- 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 ce975d7f221f52420184330d0e4513fbb061fb0b..4785d25874b9d03bb3329d96f3d8bc80f9feafdd 100644 (file)
--- 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)