wireless: remove RFKILL_STATE_HARD_BLOCKED warnings
CC [M] drivers/net/wireless/b43/rfkill.o drivers/net/wireless/b43/rfkill.c: In function ‘b43_rfkill_soft_toggle’: drivers/net/wireless/b43/rfkill.c:90: warning: enumeration value ‘RFKILL_STATE_HARD_BLOCKED’ not handled in switch CC [M] drivers/net/wireless/b43legacy/rfkill.o drivers/net/wireless/b43legacy/rfkill.c: In function ‘b43legacy_rfkill_soft_toggle’: drivers/net/wireless/b43legacy/rfkill.c:92: warning: enumeration value ‘RFKILL_STATE_HARD_BLOCKED’ not handled in switch CC [M] drivers/net/wireless/iwlwifi/iwl-rfkill.o drivers/net/wireless/iwlwifi/iwl-rfkill.c: In function ‘iwl_rfkill_soft_rf_kill’: drivers/net/wireless/iwlwifi/iwl-rfkill.c:56: warning: enumeration value ‘RFKILL_STATE_HARD_BLOCKED’ not handled in switch Also handle RFKILL_STATE_{ON,OFF} -> RFKILL_STATE_{UNBLOCKED,SOFT_BLOCKED} conversion since I'm already here... Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
@@ -54,17 +54,20 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
|
||||
mutex_lock(&priv->mutex);
|
||||
|
||||
switch (state) {
|
||||
case RFKILL_STATE_ON:
|
||||
case RFKILL_STATE_UNBLOCKED:
|
||||
iwl_radio_kill_sw_enable_radio(priv);
|
||||
/* if HW rf-kill is set dont allow ON state */
|
||||
if (iwl_is_rfkill(priv))
|
||||
err = -EBUSY;
|
||||
break;
|
||||
case RFKILL_STATE_OFF:
|
||||
case RFKILL_STATE_SOFT_BLOCKED:
|
||||
iwl_radio_kill_sw_disable_radio(priv);
|
||||
if (!iwl_is_rfkill(priv))
|
||||
err = -EBUSY;
|
||||
break;
|
||||
default:
|
||||
IWL_WARNING("we recieved unexpected RFKILL state %d\n", state);
|
||||
break;
|
||||
}
|
||||
mutex_unlock(&priv->mutex);
|
||||
|
||||
|
Reference in New Issue
Block a user