diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-13 05:23:23 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:51:16 -0500 |
commit | c37281a076604937ec2403f3cfec71362f93c7d8 (patch) | |
tree | 014b2b9a7b0aebed5788ab306a08afc09ad56f28 /drivers/net/wireless/iwlegacy | |
parent | 774212b3f3fd590f4da03dc898aff3d9980f1ae0 (diff) |
iwleagcy: fix ident code damage
Using ident is not always good.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 18 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 18 |
2 files changed, 10 insertions, 26 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index 99d7c729d8ce..002cf4fd5a55 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -2272,12 +2272,8 @@ __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, | 2275 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | |
2276 | &il-> | 2276 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
2277 | status) << S_RF_KILL_HW | | ||
2278 | test_bit(S_GEO_CONFIGURED, | ||
2279 | &il-> | ||
2280 | status) << S_GEO_CONFIGURED | | ||
2281 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 2277 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
2282 | goto exit; | 2278 | goto exit; |
2283 | } | 2279 | } |
@@ -2285,13 +2281,9 @@ __il3945_down(struct il_priv *il) | |||
2285 | /* ...otherwise clear out all the status bits but the RF Kill | 2281 | /* ...otherwise clear out all the status bits but the RF Kill |
2286 | * bit and continue taking the NIC down. */ | 2282 | * bit and continue taking the NIC down. */ |
2287 | il->status &= | 2283 | il->status &= |
2288 | test_bit(S_RF_KILL_HW, | 2284 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | |
2289 | &il->status) << S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED, | 2285 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
2290 | &il-> | 2286 | test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR | |
2291 | status) << | ||
2292 | S_GEO_CONFIGURED | test_bit(S_FW_ERROR, | ||
2293 | &il-> | ||
2294 | status) << S_FW_ERROR | | ||
2295 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 2287 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
2296 | 2288 | ||
2297 | il3945_hw_txq_ctx_stop(il); | 2289 | il3945_hw_txq_ctx_stop(il); |
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index b251d34f0790..8930e7aa13a7 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
@@ -5384,12 +5384,8 @@ __il4965_down(struct il_priv *il) | |||
5384 | * clear all bits but the RF Kill bit and return */ | 5384 | * clear all bits but the RF Kill bit and return */ |
5385 | if (!il_is_init(il)) { | 5385 | if (!il_is_init(il)) { |
5386 | il->status = | 5386 | il->status = |
5387 | test_bit(S_RF_KILL_HW, | 5387 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | |
5388 | &il-> | 5388 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
5389 | status) << S_RF_KILL_HW | | ||
5390 | test_bit(S_GEO_CONFIGURED, | ||
5391 | &il-> | ||
5392 | status) << S_GEO_CONFIGURED | | ||
5393 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 5389 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
5394 | goto exit; | 5390 | goto exit; |
5395 | } | 5391 | } |
@@ -5397,13 +5393,9 @@ __il4965_down(struct il_priv *il) | |||
5397 | /* ...otherwise clear out all the status bits but the RF Kill | 5393 | /* ...otherwise clear out all the status bits but the RF Kill |
5398 | * bit and continue taking the NIC down. */ | 5394 | * bit and continue taking the NIC down. */ |
5399 | il->status &= | 5395 | il->status &= |
5400 | test_bit(S_RF_KILL_HW, | 5396 | test_bit(S_RF_KILL_HW, &il->status) << S_RF_KILL_HW | |
5401 | &il->status) << S_RF_KILL_HW | test_bit(S_GEO_CONFIGURED, | 5397 | test_bit(S_GEO_CONFIGURED, &il->status) << S_GEO_CONFIGURED | |
5402 | &il-> | 5398 | test_bit(S_FW_ERROR, &il->status) << S_FW_ERROR | |
5403 | status) << | ||
5404 | S_GEO_CONFIGURED | test_bit(S_FW_ERROR, | ||
5405 | &il-> | ||
5406 | status) << S_FW_ERROR | | ||
5407 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; | 5399 | test_bit(S_EXIT_PENDING, &il->status) << S_EXIT_PENDING; |
5408 | 5400 | ||
5409 | il4965_txq_ctx_stop(il); | 5401 | il4965_txq_ctx_stop(il); |