Commit ff28bd94 authored by John W. Linville's avatar John W. Linville

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: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d195a2ca
...@@ -88,7 +88,7 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state) ...@@ -88,7 +88,7 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
goto out_unlock; goto out_unlock;
err = 0; err = 0;
switch (state) { switch (state) {
case RFKILL_STATE_ON: case RFKILL_STATE_UNBLOCKED:
if (!dev->radio_hw_enable) { if (!dev->radio_hw_enable) {
/* No luck. We can't toggle the hardware RF-kill /* No luck. We can't toggle the hardware RF-kill
* button from software. */ * button from software. */
...@@ -98,10 +98,13 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state) ...@@ -98,10 +98,13 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
if (!dev->phy.radio_on) if (!dev->phy.radio_on)
b43_radio_turn_on(dev); b43_radio_turn_on(dev);
break; break;
case RFKILL_STATE_OFF: case RFKILL_STATE_SOFT_BLOCKED:
if (dev->phy.radio_on) if (dev->phy.radio_on)
b43_radio_turn_off(dev, 0); b43_radio_turn_off(dev, 0);
break; break;
default:
b43warn(wl, "Received unexpected rfkill state %d.\n", state);
break;
} }
out_unlock: out_unlock:
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
......
...@@ -90,7 +90,7 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state) ...@@ -90,7 +90,7 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state)
goto out_unlock; goto out_unlock;
err = 0; err = 0;
switch (state) { switch (state) {
case RFKILL_STATE_ON: case RFKILL_STATE_UNBLOCKED:
if (!dev->radio_hw_enable) { if (!dev->radio_hw_enable) {
/* No luck. We can't toggle the hardware RF-kill /* No luck. We can't toggle the hardware RF-kill
* button from software. */ * button from software. */
...@@ -100,10 +100,14 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state) ...@@ -100,10 +100,14 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state)
if (!dev->phy.radio_on) if (!dev->phy.radio_on)
b43legacy_radio_turn_on(dev); b43legacy_radio_turn_on(dev);
break; break;
case RFKILL_STATE_OFF: case RFKILL_STATE_SOFT_BLOCKED:
if (dev->phy.radio_on) if (dev->phy.radio_on)
b43legacy_radio_turn_off(dev, 0); b43legacy_radio_turn_off(dev, 0);
break; break;
default:
b43legacywarn(wl, "Received unexpected rfkill state %d.\n",
state);
break;
} }
out_unlock: out_unlock:
......
...@@ -54,17 +54,20 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state) ...@@ -54,17 +54,20 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
switch (state) { switch (state) {
case RFKILL_STATE_ON: case RFKILL_STATE_UNBLOCKED:
iwl_radio_kill_sw_enable_radio(priv); iwl_radio_kill_sw_enable_radio(priv);
/* if HW rf-kill is set dont allow ON state */ /* if HW rf-kill is set dont allow ON state */
if (iwl_is_rfkill(priv)) if (iwl_is_rfkill(priv))
err = -EBUSY; err = -EBUSY;
break; break;
case RFKILL_STATE_OFF: case RFKILL_STATE_SOFT_BLOCKED:
iwl_radio_kill_sw_disable_radio(priv); iwl_radio_kill_sw_disable_radio(priv);
if (!iwl_is_rfkill(priv)) if (!iwl_is_rfkill(priv))
err = -EBUSY; err = -EBUSY;
break; break;
default:
IWL_WARNING("we recieved unexpected RFKILL state %d\n", state);
break;
} }
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
......
...@@ -45,14 +45,17 @@ static int rt2x00rfkill_toggle_radio(void *data, enum rfkill_state state) ...@@ -45,14 +45,17 @@ static int rt2x00rfkill_toggle_radio(void *data, enum rfkill_state state)
if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags)) if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
return 0; return 0;
if (state == RFKILL_STATE_ON) { if (state == RFKILL_STATE_UNBLOCKED) {
INFO(rt2x00dev, "Hardware button pressed, enabling radio.\n"); INFO(rt2x00dev, "Hardware button pressed, enabling radio.\n");
__clear_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags); __clear_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
retval = rt2x00lib_enable_radio(rt2x00dev); retval = rt2x00lib_enable_radio(rt2x00dev);
} else if (state == RFKILL_STATE_OFF) { } else if (state == RFKILL_STATE_SOFT_BLOCKED) {
INFO(rt2x00dev, "Hardware button pressed, disabling radio.\n"); INFO(rt2x00dev, "Hardware button pressed, disabling radio.\n");
__set_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags); __set_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
rt2x00lib_disable_radio(rt2x00dev); rt2x00lib_disable_radio(rt2x00dev);
} else {
WARNING(rt2x00dev, "Received unexpected rfkill state %d.\n",
state);
} }
return retval; return retval;
......
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