Skip to content

Commit

Permalink
iwlegacy: s/S_RF_KILL_HW/S_RFKILL/g
Browse files Browse the repository at this point in the history 
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Stanislaw Gruszka authored and John W. Linville committed Feb 22, 2012
1 parent d87c771 commit bc269a8
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 36 deletions.
30 changes: 15 additions & 15 deletions drivers/net/wireless/iwlegacy/3945-mac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -809,16 +809,16 @@ il3945_hdl_card_state(struct il_priv *il, struct il_rx_buf *rxb)
_il_wr(il, CSR_UCODE_DRV_GP1_SET, CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED);

if (flags & HW_CARD_DISABLED)
set_bit(S_RF_KILL_HW, &il->status);
set_bit(S_RFKILL, &il->status);
else
clear_bit(S_RF_KILL_HW, &il->status);
clear_bit(S_RFKILL, &il->status);

il_scan_cancel(il);

if ((test_bit(S_RF_KILL_HW, &status) !=
test_bit(S_RF_KILL_HW, &il->status)))
if ((test_bit(S_RFKILL, &status) !=
test_bit(S_RFKILL, &il->status)))
wiphy_rfkill_set_hw_state(il->hw->wiphy,
test_bit(S_RF_KILL_HW, &il->status));
test_bit(S_RFKILL, &il->status));
else
wake_up(&il->wait_command_queue);
}
Expand Down Expand Up @@ -2166,7 +2166,7 @@ il3945_alive_start(struct il_priv *il)
D_INFO("RFKILL status: 0x%x\n", rfkill);

if (rfkill & 0x1) {
clear_bit(S_RF_KILL_HW, &il->status);
clear_bit(S_RFKILL, &il->status);
/* if RFKILL is not on, then wait for thermal
* sensor in adapter to kick in */
while (il3945_hw_get_temperature(il) == 0) {
Expand All @@ -2178,7 +2178,7 @@ il3945_alive_start(struct il_priv *il)
D_INFO("Thermal calibration took %dus\n",
thermal_spin * 10);
} else
set_bit(S_RF_KILL_HW, &il->status);
set_bit(S_RFKILL, &il->status);

/* After the ALIVE response, we can send commands to 3945 uCode */
set_bit(S_ALIVE, &il->status);
Expand Down Expand Up @@ -2272,7 +2272,7 @@ __il3945_down(struct il_priv *il)
* clear all bits but the RF Kill bits and return */
if (!il_is_init(il)) {
il->status =
test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
test_bit(S_RFKILL, &il->status) << S_RFKILL |
test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
goto exit;
Expand All @@ -2281,7 +2281,7 @@ __il3945_down(struct il_priv *il)
/* ...otherwise clear out all the status bits but the RF Kill
* bit and continue taking the NIC down. */
il->status &=
test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
test_bit(S_RFKILL, &il->status) << S_RFKILL |
test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR |
test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
Expand Down Expand Up @@ -2371,9 +2371,9 @@ __il3945_up(struct il_priv *il)

/* If platform's RF_KILL switch is NOT set to KILL */
if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
clear_bit(S_RF_KILL_HW, &il->status);
clear_bit(S_RFKILL, &il->status);
else {
set_bit(S_RF_KILL_HW, &il->status);
set_bit(S_RFKILL, &il->status);
IL_WARN("Radio disabled by HW RF Kill switch\n");
return -ENODEV;
}
Expand Down Expand Up @@ -2405,7 +2405,7 @@ __il3945_up(struct il_priv *il)
il->ucode_data.len);

/* We return success when we resume from suspend and rf_kill is on. */
if (test_bit(S_RF_KILL_HW, &il->status))
if (test_bit(S_RFKILL, &il->status))
return 0;

for (i = 0; i < MAX_HW_RESTARTS; i++) {
Expand Down Expand Up @@ -2485,15 +2485,15 @@ il3945_rfkill_poll(struct work_struct *data)
{
struct il_priv *il =
container_of(data, struct il_priv, _3945.rfkill_poll.work);
bool old_rfkill = test_bit(S_RF_KILL_HW, &il->status);
bool old_rfkill = test_bit(S_RFKILL, &il->status);
bool new_rfkill =
!(_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW);

if (new_rfkill != old_rfkill) {
if (new_rfkill)
set_bit(S_RF_KILL_HW, &il->status);
set_bit(S_RFKILL, &il->status);
else
clear_bit(S_RF_KILL_HW, &il->status);
clear_bit(S_RFKILL, &il->status);

wiphy_rfkill_set_hw_state(il->hw->wiphy, new_rfkill);

Expand Down
28 changes: 14 additions & 14 deletions drivers/net/wireless/iwlegacy/4965-mac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4110,17 +4110,17 @@ il4965_hdl_card_state(struct il_priv *il, struct il_rx_buf *rxb)
il4965_perform_ct_kill_task(il);

if (flags & HW_CARD_DISABLED)
set_bit(S_RF_KILL_HW, &il->status);
set_bit(S_RFKILL, &il->status);
else
clear_bit(S_RF_KILL_HW, &il->status);
clear_bit(S_RFKILL, &il->status);

if (!(flags & RXON_CARD_DISABLED))
il_scan_cancel(il);

if ((test_bit(S_RF_KILL_HW, &status) !=
test_bit(S_RF_KILL_HW, &il->status)))
if ((test_bit(S_RFKILL, &status) !=
test_bit(S_RFKILL, &il->status)))
wiphy_rfkill_set_hw_state(il->hw->wiphy,
test_bit(S_RF_KILL_HW, &il->status));
test_bit(S_RFKILL, &il->status));
else
wake_up(&il->wait_command_queue);
}
Expand Down Expand Up @@ -4412,9 +4412,9 @@ il4965_irq_tasklet(struct il_priv *il)
*/
if (!test_bit(S_ALIVE, &il->status)) {
if (hw_rf_kill)
set_bit(S_RF_KILL_HW, &il->status);
set_bit(S_RFKILL, &il->status);
else
clear_bit(S_RF_KILL_HW, &il->status);
clear_bit(S_RFKILL, &il->status);
wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill);
}

Expand Down Expand Up @@ -5383,7 +5383,7 @@ __il4965_down(struct il_priv *il)
* clear all bits but the RF Kill bit and return */
if (!il_is_init(il)) {
il->status =
test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
test_bit(S_RFKILL, &il->status) << S_RFKILL |
test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
goto exit;
Expand All @@ -5392,7 +5392,7 @@ __il4965_down(struct il_priv *il)
/* ...otherwise clear out all the status bits but the RF Kill
* bit and continue taking the NIC down. */
il->status &=
test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW |
test_bit(S_RFKILL, &il->status) << S_RFKILL |
test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED |
test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR |
test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING;
Expand Down Expand Up @@ -5514,9 +5514,9 @@ __il4965_up(struct il_priv *il)

/* If platform's RF_KILL switch is NOT set to KILL */
if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
clear_bit(S_RF_KILL_HW, &il->status);
clear_bit(S_RFKILL, &il->status);
else {
set_bit(S_RF_KILL_HW, &il->status);
set_bit(S_RFKILL, &il->status);
wiphy_rfkill_set_hw_state(il->hw->wiphy, true);

il_enable_rfkill_int(il);
Expand Down Expand Up @@ -6612,12 +6612,12 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

/* If platform's RF_KILL switch is NOT set to KILL */
if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
clear_bit(S_RF_KILL_HW, &il->status);
clear_bit(S_RFKILL, &il->status);
else
set_bit(S_RF_KILL_HW, &il->status);
set_bit(S_RFKILL, &il->status);

wiphy_rfkill_set_hw_state(il->hw->wiphy,
test_bit(S_RF_KILL_HW, &il->status));
test_bit(S_RFKILL, &il->status));

il_power_initialize(il);

Expand Down
6 changes: 3 additions & 3 deletions drivers/net/wireless/iwlegacy/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd)
}
}

if (test_bit(S_RF_KILL_HW, &il->status)) {
if (test_bit(S_RFKILL, &il->status)) {
IL_ERR("Command %s aborted: RF KILL Switch\n",
il_get_cmd_string(cmd->id));
ret = -ECANCELED;
Expand Down Expand Up @@ -4890,9 +4890,9 @@ il_pci_resume(struct device *device)
hw_rfkill = true;

if (hw_rfkill)
set_bit(S_RF_KILL_HW, &il->status);
set_bit(S_RFKILL, &il->status);
else
clear_bit(S_RF_KILL_HW, &il->status);
clear_bit(S_RFKILL, &il->status);

wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rfkill);

Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/iwlegacy/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1906,7 +1906,7 @@ void il_free_geos(struct il_priv *il);
#define S_HCMD_ACTIVE 0 /* host command in progress */
/* 1 is unused (used to be S_HCMD_SYNC_ACTIVE) */
#define S_INT_ENABLED 2
#define S_RF_KILL_HW 3
#define S_RFKILL 3
#define S_CT_KILL 4
#define S_INIT 5
#define S_ALIVE 6
Expand Down Expand Up @@ -1947,7 +1947,7 @@ il_is_init(struct il_priv *il)
static inline int
il_is_rfkill_hw(struct il_priv *il)
{
return test_bit(S_RF_KILL_HW, &il->status);
return test_bit(S_RFKILL, &il->status);
}

static inline int
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/iwlegacy/debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,8 +630,8 @@ il_dbgfs_status_read(struct file *file, char __user *user_buf, size_t count,
scnprintf(buf + pos, bufsz - pos, "S_INT_ENABLED:\t %d\n",
test_bit(S_INT_ENABLED, &il->status));
pos +=
scnprintf(buf + pos, bufsz - pos, "S_RF_KILL_HW:\t %d\n",
test_bit(S_RF_KILL_HW, &il->status));
scnprintf(buf + pos, bufsz - pos, "S_RFKILL:\t %d\n",
test_bit(S_RFKILL, &il->status));
pos +=
scnprintf(buf + pos, bufsz - pos, "S_CT_KILL:\t\t %d\n",
test_bit(S_CT_KILL, &il->status));
Expand Down

0 comments on commit bc269a8

Please sign in to comment.