diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-13 05:23:29 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:51:17 -0500 |
commit | bc269a8e2701aaa6c53553eaef9f0866ef03e703 (patch) | |
tree | 020437a850e7979faa3db5c9ba9780cdd6f93076 /drivers | |
parent | d87c771f47460f7ca943942d508f2b9bd223a7e0 (diff) |
iwlegacy: s/S_RF_KILL_HW/S_RFKILL/g
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 30 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 28 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/common.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/debug.c | 4 |
5 files changed, 36 insertions, 36 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index ee91ab2e385..0ccc934a35b 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -809,16 +809,16 @@ il3945_hdl_card_state(struct il_priv *il, struct il_rx_buf *rxb) | |||
809 | _il_wr(il, CSR_UCODE_DRV_GP1_SET, CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); | 809 | _il_wr(il, CSR_UCODE_DRV_GP1_SET, CSR_UCODE_DRV_GP1_BIT_CMD_BLOCKED); |
810 | 810 | ||
811 | if (flags & HW_CARD_DISABLED) | 811 | if (flags & HW_CARD_DISABLED) |
812 | set_bit(S_RF_KILL_HW, &il->status); | 812 | set_bit(S_RFKILL, &il->status); |
813 | else | 813 | else |
814 | clear_bit(S_RF_KILL_HW, &il->status); | 814 | clear_bit(S_RFKILL, &il->status); |
815 | 815 | ||
816 | il_scan_cancel(il); | 816 | il_scan_cancel(il); |
817 | 817 | ||
818 | if ((test_bit(S_RF_KILL_HW, &status) != | 818 | if ((test_bit(S_RFKILL, &status) != |
819 | test_bit(S_RF_KILL_HW, &il->status))) | 819 | test_bit(S_RFKILL, &il->status))) |
820 | wiphy_rfkill_set_hw_state(il->hw->wiphy, | 820 | wiphy_rfkill_set_hw_state(il->hw->wiphy, |
821 | test_bit(S_RF_KILL_HW, &il->status)); | 821 | test_bit(S_RFKILL, &il->status)); |
822 | else | 822 | else |
823 | wake_up(&il->wait_command_queue); | 823 | wake_up(&il->wait_command_queue); |
824 | } | 824 | } |
@@ -2166,7 +2166,7 @@ il3945_alive_start(struct il_priv *il) | |||
2166 | D_INFO("RFKILL status: 0x%x\n", rfkill); | 2166 | D_INFO("RFKILL status: 0x%x\n", rfkill); |
2167 | 2167 | ||
2168 | if (rfkill & 0x1) { | 2168 | if (rfkill & 0x1) { |
2169 | clear_bit(S_RF_KILL_HW, &il->status); | 2169 | clear_bit(S_RFKILL, &il->status); |
2170 | /* if RFKILL is not on, then wait for thermal | 2170 | /* if RFKILL is not on, then wait for thermal |
2171 | * sensor in adapter to kick in */ | 2171 | * sensor in adapter to kick in */ |
2172 | while (il3945_hw_get_temperature(il) == 0) { | 2172 | while (il3945_hw_get_temperature(il) == 0) { |
@@ -2178,7 +2178,7 @@ il3945_alive_start(struct il_priv *il) | |||
2178 | D_INFO("Thermal calibration took %dus\n", | 2178 | D_INFO("Thermal calibration took %dus\n", |
2179 | thermal_spin * 10); | 2179 | thermal_spin * 10); |
2180 | } else | 2180 | } else |
2181 | set_bit(S_RF_KILL_HW, &il->status); | 2181 | set_bit(S_RFKILL, &il->status); |
2182 | 2182 | ||
2183 | /* After the ALIVE response, we can send commands to 3945 uCode */ | 2183 | /* After the ALIVE response, we can send commands to 3945 uCode */ |
2184 | set_bit(S_ALIVE, &il->status); | 2184 | set_bit(S_ALIVE, &il->status); |
@@ -2272,7 +2272,7 @@ __il3945_down(struct il_priv *il) | |||
2272 | * clear all bits but the RF Kill bits and return */ | 2272 | * clear all bits but the RF Kill bits and return */ |
2273 | if (!il_is_init(il)) { | 2273 | if (!il_is_init(il)) { |
2274 | il->status = | 2274 | il->status = |
2275 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | | 2275 | test_bit(S_RFKILL, &il->status) << S_RFKILL | |
2276 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | | 2276 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
2277 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 2277 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
2278 | goto exit; | 2278 | goto exit; |
@@ -2281,7 +2281,7 @@ __il3945_down(struct il_priv *il) | |||
2281 | /* ...otherwise clear out all the status bits but the RF Kill | 2281 | /* ...otherwise clear out all the status bits but the RF Kill |
2282 | * bit and continue taking the NIC down. */ | 2282 | * bit and continue taking the NIC down. */ |
2283 | il->status &= | 2283 | il->status &= |
2284 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | | 2284 | test_bit(S_RFKILL, &il->status) << S_RFKILL | |
2285 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | | 2285 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
2286 | test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR | | 2286 | test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR | |
2287 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 2287 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
@@ -2371,9 +2371,9 @@ __il3945_up(struct il_priv *il) | |||
2371 | 2371 | ||
2372 | /* If platform's RF_KILL switch is NOT set to KILL */ | 2372 | /* If platform's RF_KILL switch is NOT set to KILL */ |
2373 | if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) | 2373 | if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) |
2374 | clear_bit(S_RF_KILL_HW, &il->status); | 2374 | clear_bit(S_RFKILL, &il->status); |
2375 | else { | 2375 | else { |
2376 | set_bit(S_RF_KILL_HW, &il->status); | 2376 | set_bit(S_RFKILL, &il->status); |
2377 | IL_WARN("Radio disabled by HW RF Kill switch\n"); | 2377 | IL_WARN("Radio disabled by HW RF Kill switch\n"); |
2378 | return -ENODEV; | 2378 | return -ENODEV; |
2379 | } | 2379 | } |
@@ -2405,7 +2405,7 @@ __il3945_up(struct il_priv *il) | |||
2405 | il->ucode_data.len); | 2405 | il->ucode_data.len); |
2406 | 2406 | ||
2407 | /* We return success when we resume from suspend and rf_kill is on. */ | 2407 | /* We return success when we resume from suspend and rf_kill is on. */ |
2408 | if (test_bit(S_RF_KILL_HW, &il->status)) | 2408 | if (test_bit(S_RFKILL, &il->status)) |
2409 | return 0; | 2409 | return 0; |
2410 | 2410 | ||
2411 | for (i = 0; i < MAX_HW_RESTARTS; i++) { | 2411 | for (i = 0; i < MAX_HW_RESTARTS; i++) { |
@@ -2485,15 +2485,15 @@ il3945_rfkill_poll(struct work_struct *data) | |||
2485 | { | 2485 | { |
2486 | struct il_priv *il = | 2486 | struct il_priv *il = |
2487 | container_of(data, struct il_priv, _3945.rfkill_poll.work); | 2487 | container_of(data, struct il_priv, _3945.rfkill_poll.work); |
2488 | bool old_rfkill = test_bit(S_RF_KILL_HW, &il->status); | 2488 | bool old_rfkill = test_bit(S_RFKILL, &il->status); |
2489 | bool new_rfkill = | 2489 | bool new_rfkill = |
2490 | !(_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW); | 2490 | !(_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW); |
2491 | 2491 | ||
2492 | if (new_rfkill != old_rfkill) { | 2492 | if (new_rfkill != old_rfkill) { |
2493 | if (new_rfkill) | 2493 | if (new_rfkill) |
2494 | set_bit(S_RF_KILL_HW, &il->status); | 2494 | set_bit(S_RFKILL, &il->status); |
2495 | else | 2495 | else |
2496 | clear_bit(S_RF_KILL_HW, &il->status); | 2496 | clear_bit(S_RFKILL, &il->status); |
2497 | 2497 | ||
2498 | wiphy_rfkill_set_hw_state(il->hw->wiphy, new_rfkill); | 2498 | wiphy_rfkill_set_hw_state(il->hw->wiphy, new_rfkill); |
2499 | 2499 | ||
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index a0158e3efd0..3aa0ee5458f 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
@@ -4110,17 +4110,17 @@ il4965_hdl_card_state(struct il_priv *il, struct il_rx_buf *rxb) | |||
4110 | il4965_perform_ct_kill_task(il); | 4110 | il4965_perform_ct_kill_task(il); |
4111 | 4111 | ||
4112 | if (flags & HW_CARD_DISABLED) | 4112 | if (flags & HW_CARD_DISABLED) |
4113 | set_bit(S_RF_KILL_HW, &il->status); | 4113 | set_bit(S_RFKILL, &il->status); |
4114 | else | 4114 | else |
4115 | clear_bit(S_RF_KILL_HW, &il->status); | 4115 | clear_bit(S_RFKILL, &il->status); |
4116 | 4116 | ||
4117 | if (!(flags & RXON_CARD_DISABLED)) | 4117 | if (!(flags & RXON_CARD_DISABLED)) |
4118 | il_scan_cancel(il); | 4118 | il_scan_cancel(il); |
4119 | 4119 | ||
4120 | if ((test_bit(S_RF_KILL_HW, &status) != | 4120 | if ((test_bit(S_RFKILL, &status) != |
4121 | test_bit(S_RF_KILL_HW, &il->status))) | 4121 | test_bit(S_RFKILL, &il->status))) |
4122 | wiphy_rfkill_set_hw_state(il->hw->wiphy, | 4122 | wiphy_rfkill_set_hw_state(il->hw->wiphy, |
4123 | test_bit(S_RF_KILL_HW, &il->status)); | 4123 | test_bit(S_RFKILL, &il->status)); |
4124 | else | 4124 | else |
4125 | wake_up(&il->wait_command_queue); | 4125 | wake_up(&il->wait_command_queue); |
4126 | } | 4126 | } |
@@ -4412,9 +4412,9 @@ il4965_irq_tasklet(struct il_priv *il) | |||
4412 | */ | 4412 | */ |
4413 | if (!test_bit(S_ALIVE, &il->status)) { | 4413 | if (!test_bit(S_ALIVE, &il->status)) { |
4414 | if (hw_rf_kill) | 4414 | if (hw_rf_kill) |
4415 | set_bit(S_RF_KILL_HW, &il->status); | 4415 | set_bit(S_RFKILL, &il->status); |
4416 | else | 4416 | else |
4417 | clear_bit(S_RF_KILL_HW, &il->status); | 4417 | clear_bit(S_RFKILL, &il->status); |
4418 | wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill); | 4418 | wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill); |
4419 | } | 4419 | } |
4420 | 4420 | ||
@@ -5383,7 +5383,7 @@ __il4965_down(struct il_priv *il) | |||
5383 | * clear all bits but the RF Kill bit and return */ | 5383 | * clear all bits but the RF Kill bit and return */ |
5384 | if (!il_is_init(il)) { | 5384 | if (!il_is_init(il)) { |
5385 | il->status = | 5385 | il->status = |
5386 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | | 5386 | test_bit(S_RFKILL, &il->status) << S_RFKILL | |
5387 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | | 5387 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
5388 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 5388 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
5389 | goto exit; | 5389 | goto exit; |
@@ -5392,7 +5392,7 @@ __il4965_down(struct il_priv *il) | |||
5392 | /* ...otherwise clear out all the status bits but the RF Kill | 5392 | /* ...otherwise clear out all the status bits but the RF Kill |
5393 | * bit and continue taking the NIC down. */ | 5393 | * bit and continue taking the NIC down. */ |
5394 | il->status &= | 5394 | il->status &= |
5395 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | | 5395 | test_bit(S_RFKILL, &il->status) << S_RFKILL | |
5396 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | | 5396 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
5397 | test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR | | 5397 | test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR | |
5398 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 5398 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
@@ -5514,9 +5514,9 @@ __il4965_up(struct il_priv *il) | |||
5514 | 5514 | ||
5515 | /* If platform's RF_KILL switch is NOT set to KILL */ | 5515 | /* If platform's RF_KILL switch is NOT set to KILL */ |
5516 | if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) | 5516 | if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) |
5517 | clear_bit(S_RF_KILL_HW, &il->status); | 5517 | clear_bit(S_RFKILL, &il->status); |
5518 | else { | 5518 | else { |
5519 | set_bit(S_RF_KILL_HW, &il->status); | 5519 | set_bit(S_RFKILL, &il->status); |
5520 | wiphy_rfkill_set_hw_state(il->hw->wiphy, true); | 5520 | wiphy_rfkill_set_hw_state(il->hw->wiphy, true); |
5521 | 5521 | ||
5522 | il_enable_rfkill_int(il); | 5522 | il_enable_rfkill_int(il); |
@@ -6612,12 +6612,12 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
6612 | 6612 | ||
6613 | /* If platform's RF_KILL switch is NOT set to KILL */ | 6613 | /* If platform's RF_KILL switch is NOT set to KILL */ |
6614 | if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) | 6614 | if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) |
6615 | clear_bit(S_RF_KILL_HW, &il->status); | 6615 | clear_bit(S_RFKILL, &il->status); |
6616 | else | 6616 | else |
6617 | set_bit(S_RF_KILL_HW, &il->status); | 6617 | set_bit(S_RFKILL, &il->status); |
6618 | 6618 | ||
6619 | wiphy_rfkill_set_hw_state(il->hw->wiphy, | 6619 | wiphy_rfkill_set_hw_state(il->hw->wiphy, |
6620 | test_bit(S_RF_KILL_HW, &il->status)); | 6620 | test_bit(S_RFKILL, &il->status)); |
6621 | 6621 | ||
6622 | il_power_initialize(il); | 6622 | il_power_initialize(il); |
6623 | 6623 | ||
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index 872302a3f86..defe8d9a4f5 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c | |||
@@ -350,7 +350,7 @@ il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd) | |||
350 | } | 350 | } |
351 | } | 351 | } |
352 | 352 | ||
353 | if (test_bit(S_RF_KILL_HW, &il->status)) { | 353 | if (test_bit(S_RFKILL, &il->status)) { |
354 | IL_ERR("Command %s aborted: RF KILL Switch\n", | 354 | IL_ERR("Command %s aborted: RF KILL Switch\n", |
355 | il_get_cmd_string(cmd->id)); | 355 | il_get_cmd_string(cmd->id)); |
356 | ret = -ECANCELED; | 356 | ret = -ECANCELED; |
@@ -4890,9 +4890,9 @@ il_pci_resume(struct device *device) | |||
4890 | hw_rfkill = true; | 4890 | hw_rfkill = true; |
4891 | 4891 | ||
4892 | if (hw_rfkill) | 4892 | if (hw_rfkill) |
4893 | set_bit(S_RF_KILL_HW, &il->status); | 4893 | set_bit(S_RFKILL, &il->status); |
4894 | else | 4894 | else |
4895 | clear_bit(S_RF_KILL_HW, &il->status); | 4895 | clear_bit(S_RFKILL, &il->status); |
4896 | 4896 | ||
4897 | wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rfkill); | 4897 | wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rfkill); |
4898 | 4898 | ||
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h index e2f55dc8693..42820183dbe 100644 --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h | |||
@@ -1906,7 +1906,7 @@ void il_free_geos(struct il_priv *il); | |||
1906 | #define S_HCMD_ACTIVE 0 /* host command in progress */ | 1906 | #define S_HCMD_ACTIVE 0 /* host command in progress */ |
1907 | /* 1 is unused (used to be S_HCMD_SYNC_ACTIVE) */ | 1907 | /* 1 is unused (used to be S_HCMD_SYNC_ACTIVE) */ |
1908 | #define S_INT_ENABLED 2 | 1908 | #define S_INT_ENABLED 2 |
1909 | #define S_RF_KILL_HW 3 | 1909 | #define S_RFKILL 3 |
1910 | #define S_CT_KILL 4 | 1910 | #define S_CT_KILL 4 |
1911 | #define S_INIT 5 | 1911 | #define S_INIT 5 |
1912 | #define S_ALIVE 6 | 1912 | #define S_ALIVE 6 |
@@ -1947,7 +1947,7 @@ il_is_init(struct il_priv *il) | |||
1947 | static inline int | 1947 | static inline int |
1948 | il_is_rfkill_hw(struct il_priv *il) | 1948 | il_is_rfkill_hw(struct il_priv *il) |
1949 | { | 1949 | { |
1950 | return test_bit(S_RF_KILL_HW, &il->status); | 1950 | return test_bit(S_RFKILL, &il->status); |
1951 | } | 1951 | } |
1952 | 1952 | ||
1953 | static inline int | 1953 | static inline int |
diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c index 236dc90b035..229849150aa 100644 --- a/drivers/net/wireless/iwlegacy/debug.c +++ b/drivers/net/wireless/iwlegacy/debug.c | |||
@@ -630,8 +630,8 @@ il_dbgfs_status_read(struct file *file, char __user *user_buf, size_t count, | |||
630 | scnprintf(buf + pos, bufsz - pos, "S_INT_ENABLED:\t %d\n", | 630 | scnprintf(buf + pos, bufsz - pos, "S_INT_ENABLED:\t %d\n", |
631 | test_bit(S_INT_ENABLED, &il->status)); | 631 | test_bit(S_INT_ENABLED, &il->status)); |
632 | pos += | 632 | pos += |
633 | scnprintf(buf + pos, bufsz - pos, "S_RF_KILL_HW:\t %d\n", | 633 | scnprintf(buf + pos, bufsz - pos, "S_RFKILL:\t %d\n", |
634 | test_bit(S_RF_KILL_HW, &il->status)); | 634 | test_bit(S_RFKILL, &il->status)); |
635 | pos += | 635 | pos += |
636 | scnprintf(buf + pos, bufsz - pos, "S_CT_KILL:\t\t %d\n", | 636 | scnprintf(buf + pos, bufsz - pos, "S_CT_KILL:\t\t %d\n", |
637 | test_bit(S_CT_KILL, &il->status)); | 637 | test_bit(S_CT_KILL, &il->status)); |