Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

beceem: eliminate network registered state variable

Just use presence of pointer

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

+7 -28
-1
drivers/staging/bcm/Adapter.h
··· 599 599 600 600 601 601 struct semaphore NVMRdmWrmLock; 602 - BOOLEAN bNetworkInterfaceRegistered; 603 602 604 603 struct device *pstCreatedClassDevice; 605 604 BOOLEAN bUsbClassDriverRegistered;
+7 -27
drivers/staging/bcm/Bcmnet.c
··· 115 115 ReadMacAddressFromNVM(Adapter); 116 116 117 117 result = register_netdev(Adapter->dev); 118 - if (!result) 119 - { 120 - Adapter->bNetworkInterfaceRegistered = TRUE ; 121 - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Beceem Network device name is %s!", Adapter->dev->name); 122 - } 123 - else 124 - { 125 - BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Network device can not be registered!"); 126 - Adapter->bNetworkInterfaceRegistered = FALSE ; 127 - return result; 118 + if (!result) { 119 + free_netdev(Adapter->dev); 120 + Adapter->dev = NULL; 128 121 } 129 122 130 - #if 0 131 - Adapter->stDebugState.debug_level = DBG_LVL_CURR; 132 - Adapter->stDebugState.type =(UINT)0xffffffff; 133 - Adapter->stDebugState.subtype[DBG_TYPE_OTHERS] = 0xffffffff; 134 - Adapter->stDebugState.subtype[DBG_TYPE_RX] = 0xffffffff; 135 - Adapter->stDebugState.subtype[DBG_TYPE_TX] = 0xffffffff; 136 - Adapter->stDebugState.subtype[DBG_TYPE_INITEXIT] = 0xffffffff; 137 - 138 - printk("-------ps_adapter->stDebugState.type=%x\n",Adapter->stDebugState.type); 139 - printk("-------ps_adapter->stDebugState.subtype[DBG_TYPE_OTHERS]=%x\n",Adapter->stDebugState.subtype[DBG_TYPE_OTHERS]); 140 - printk("-------ps_adapter->stDebugState.subtype[DBG_TYPE_RX]=%x\n",Adapter->stDebugState.subtype[DBG_TYPE_RX]); 141 - printk("-------ps_adapter->stDebugState.subtype[DBG_TYPE_TX]=%x\n",Adapter->stDebugState.subtype[DBG_TYPE_TX]); 142 - #endif 143 - 144 - return 0; 123 + return result; 145 124 } 146 125 147 126 void bcm_unregister_networkdev(PMINI_ADAPTER Adapter) 148 127 { 149 128 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Unregistering the Net Dev...\n"); 150 - if(Adapter->dev && !IS_ERR(Adapter->dev) && Adapter->bNetworkInterfaceRegistered) 129 + if(Adapter->dev) { 151 130 unregister_netdev(Adapter->dev); 152 - /* Unregister the notifier block */ 131 + Adapter->dev = NULL; 132 + } 153 133 } 154 134 155 135 static int bcm_init(void)