aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/3945.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 07:09:01 -0500
committerStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 07:09:01 -0500
commita6766ccdaf9cc80d565672516d429a562d1a732d (patch)
treed9a98acc6eef19ef41a7ef053117ba7df1c53324 /drivers/net/wireless/iwlegacy/3945.c
parent6bbb1370c3083190cae8487c2c61c0d24f869e68 (diff)
iwlegacy: s/STATUS_/S_/
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945.c')
-rw-r--r--drivers/net/wireless/iwlegacy/3945.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index 17615c33d1aa..8ebd576dfe62 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -1008,7 +1008,7 @@ int il3945_hw_nic_init(struct il_priv *il)
1008 if (rc) 1008 if (rc)
1009 return rc; 1009 return rc;
1010 1010
1011 set_bit(STATUS_INIT, &il->status); 1011 set_bit(S_INIT, &il->status);
1012 1012
1013 return 0; 1013 return 0;
1014} 1014}
@@ -1394,7 +1394,7 @@ static int il3945_send_tx_power(struct il_priv *il)
1394 }; 1394 };
1395 u16 chan; 1395 u16 chan;
1396 1396
1397 if (WARN_ONCE(test_bit(STATUS_SCAN_HW, &il->status), 1397 if (WARN_ONCE(test_bit(S_SCAN_HW, &il->status),
1398 "TX Power requested while scanning!\n")) 1398 "TX Power requested while scanning!\n"))
1399 return -EAGAIN; 1399 return -EAGAIN;
1400 1400
@@ -1571,7 +1571,7 @@ static int il3945_hw_reg_comp_txpower_temp(struct il_priv *il)
1571 int temperature = il->temperature; 1571 int temperature = il->temperature;
1572 1572
1573 if (il->disable_tx_power_cal || 1573 if (il->disable_tx_power_cal ||
1574 test_bit(STATUS_SCANNING, &il->status)) { 1574 test_bit(S_SCANNING, &il->status)) {
1575 /* do not perform tx power calibration */ 1575 /* do not perform tx power calibration */
1576 return 0; 1576 return 0;
1577 } 1577 }
@@ -1726,7 +1726,7 @@ int il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)
1726 int rc = 0; 1726 int rc = 0;
1727 bool new_assoc = !!(staging_rxon->filter_flags & RXON_FILTER_ASSOC_MSK); 1727 bool new_assoc = !!(staging_rxon->filter_flags & RXON_FILTER_ASSOC_MSK);
1728 1728
1729 if (test_bit(STATUS_EXIT_PENDING, &il->status)) 1729 if (test_bit(S_EXIT_PENDING, &il->status))
1730 return -EINVAL; 1730 return -EINVAL;
1731 1731
1732 if (!il_is_alive(il)) 1732 if (!il_is_alive(il))
@@ -1885,7 +1885,7 @@ static void il3945_bg_reg_txpower_periodic(struct work_struct *work)
1885 struct il_priv *il = container_of(work, struct il_priv, 1885 struct il_priv *il = container_of(work, struct il_priv,
1886 _3945.thermal_periodic.work); 1886 _3945.thermal_periodic.work);
1887 1887
1888 if (test_bit(STATUS_EXIT_PENDING, &il->status)) 1888 if (test_bit(S_EXIT_PENDING, &il->status))
1889 return; 1889 return;
1890 1890
1891 mutex_lock(&il->mutex); 1891 mutex_lock(&il->mutex);