Commit 00e2e05d authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman

Staging: w35und: simplify hal_init_hardware() error handling

Impact: cleanup

Use gotos to simplify the deep if-statement nesting in
hal_init_hardware().
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cfe31f81
...@@ -487,38 +487,42 @@ static int hal_init_hardware(struct ieee80211_hw *hw) ...@@ -487,38 +487,42 @@ static int hal_init_hardware(struct ieee80211_hw *hw)
pHwData->FragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD; // Setting default fragment threshold pHwData->FragmentThreshold = DEFAULT_FRAGMENT_THRESHOLD; // Setting default fragment threshold
pHwData->InitialResource = 1; pHwData->InitialResource = 1;
if( Wb35Reg_initial(pHwData)) { if (!Wb35Reg_initial(pHwData))
pHwData->InitialResource = 2; goto error;
if (Wb35Tx_initial(pHwData)) {
pHwData->InitialResource = 3; pHwData->InitialResource = 2;
if (Wb35Rx_initial(pHwData)) { if (!Wb35Tx_initial(pHwData))
pHwData->InitialResource = 4; goto error;
init_timer(&pHwData->LEDTimer);
pHwData->LEDTimer.function = hal_led_control; pHwData->InitialResource = 3;
pHwData->LEDTimer.data = (unsigned long) priv; if (!Wb35Rx_initial(pHwData))
pHwData->LEDTimer.expires = jiffies + msecs_to_jiffies(1000); goto error;
add_timer(&pHwData->LEDTimer);
pHwData->InitialResource = 4;
// init_timer(&pHwData->LEDTimer);
// For restrict to vendor's hardware pHwData->LEDTimer.function = hal_led_control;
// pHwData->LEDTimer.data = (unsigned long) priv;
SoftwareSet = hal_software_set( pHwData ); pHwData->LEDTimer.expires = jiffies + msecs_to_jiffies(1000);
add_timer(&pHwData->LEDTimer);
#ifdef Vendor2
// Try to make sure the EEPROM contain //
SoftwareSet >>= 8; // For restrict to vendor's hardware
if( SoftwareSet != 0x82 ) //
return false; SoftwareSet = hal_software_set( pHwData );
#endif
#ifdef Vendor2
Wb35Rx_start(hw); // Try to make sure the EEPROM contain
Wb35Tx_EP2VM_start(priv); SoftwareSet >>= 8;
if( SoftwareSet != 0x82 )
return 0; return false;
} #endif
}
}
Wb35Rx_start(hw);
Wb35Tx_EP2VM_start(priv);
return 0;
error:
pHwData->SurpriseRemove = 1; pHwData->SurpriseRemove = 1;
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment