diff options
author | Abhijeet Kolekar <abhijeet.kolekar@intel.com> | 2008-11-12 16:14:08 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-25 16:41:18 -0500 |
commit | c3056065400aeb437390e1a86b85f9c32fb1c1df (patch) | |
tree | 69e7cf607f351040bc52ce77415e7b6096a3d858 /drivers/net | |
parent | dbce56a456f6d6302a77107088340828dcaf9a02 (diff) |
iwlwifi : fix checkpatch.pl errors
Patch fixes checkpatch.pl errors for iwlwifi.
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945-io.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-io.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 |
9 files changed, 13 insertions, 12 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-io.h b/drivers/net/wireless/iwlwifi/iwl-3945-io.h index 1daa3f05a775..7dea1552a906 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-io.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945-io.h | |||
@@ -107,7 +107,7 @@ static inline int __iwl3945_poll_bit(const char *f, u32 l, | |||
107 | int ret = _iwl3945_poll_bit(priv, addr, bits, mask, timeout); | 107 | int ret = _iwl3945_poll_bit(priv, addr, bits, mask, timeout); |
108 | IWL_DEBUG_IO("poll_bit(0x%08X, 0x%08X, 0x%08X) - %s- %s %d\n", | 108 | IWL_DEBUG_IO("poll_bit(0x%08X, 0x%08X, 0x%08X) - %s- %s %d\n", |
109 | addr, bits, mask, | 109 | addr, bits, mask, |
110 | unlikely(ret == -ETIMEDOUT)?"timeout":"", f, l); | 110 | unlikely(ret == -ETIMEDOUT) ? "timeout" : "", f, l); |
111 | return ret; | 111 | return ret; |
112 | } | 112 | } |
113 | #define iwl3945_poll_bit(priv, addr, bits, mask, timeout) \ | 113 | #define iwl3945_poll_bit(priv, addr, bits, mask, timeout) \ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 17f409864eb6..9007ff2348d3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -661,7 +661,7 @@ static void iwl4965_tx_queue_set_status(struct iwl_priv *priv, | |||
661 | int txq_id = txq->q.id; | 661 | int txq_id = txq->q.id; |
662 | 662 | ||
663 | /* Find out whether to activate Tx queue */ | 663 | /* Find out whether to activate Tx queue */ |
664 | int active = test_bit(txq_id, &priv->txq_ctx_active_msk)?1:0; | 664 | int active = test_bit(txq_id, &priv->txq_ctx_active_msk) ? 1 : 0; |
665 | 665 | ||
666 | /* Set up and activate */ | 666 | /* Set up and activate */ |
667 | iwl_write_prph(priv, IWL49_SCD_QUEUE_STATUS_BITS(txq_id), | 667 | iwl_write_prph(priv, IWL49_SCD_QUEUE_STATUS_BITS(txq_id), |
@@ -2025,7 +2025,7 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, | |||
2025 | info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]); | 2025 | info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]); |
2026 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 2026 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
2027 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; | 2027 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; |
2028 | info->flags |= iwl_is_tx_success(status)? | 2028 | info->flags |= iwl_is_tx_success(status) ? |
2029 | IEEE80211_TX_STAT_ACK : 0; | 2029 | IEEE80211_TX_STAT_ACK : 0; |
2030 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); | 2030 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); |
2031 | /* FIXME: code repetition end */ | 2031 | /* FIXME: code repetition end */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index b6d7e91e8dd1..aeb69ee8706f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -1111,7 +1111,7 @@ static int iwl5000_tx_status_reply_tx(struct iwl_priv *priv, | |||
1111 | info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]); | 1111 | info = IEEE80211_SKB_CB(priv->txq[txq_id].txb[idx].skb[0]); |
1112 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 1112 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
1113 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; | 1113 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; |
1114 | info->flags |= iwl_is_tx_success(status)? | 1114 | info->flags |= iwl_is_tx_success(status) ? |
1115 | IEEE80211_TX_STAT_ACK : 0; | 1115 | IEEE80211_TX_STAT_ACK : 0; |
1116 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); | 1116 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); |
1117 | 1117 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index d8ac45dc5011..3a2b81291d86 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
@@ -2515,7 +2515,7 @@ static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file, | |||
2515 | for (i = 0; i < LQ_SIZE; i++) { | 2515 | for (i = 0; i < LQ_SIZE; i++) { |
2516 | desc += sprintf(buff+desc, "%s type=%d SGI=%d FAT=%d DUP=%d\n" | 2516 | desc += sprintf(buff+desc, "%s type=%d SGI=%d FAT=%d DUP=%d\n" |
2517 | "rate=0x%X\n", | 2517 | "rate=0x%X\n", |
2518 | lq_sta->active_tbl == i?"*":"x", | 2518 | lq_sta->active_tbl == i ? "*" : "x", |
2519 | lq_sta->lq_info[i].lq_type, | 2519 | lq_sta->lq_info[i].lq_type, |
2520 | lq_sta->lq_info[i].is_SGI, | 2520 | lq_sta->lq_info[i].is_SGI, |
2521 | lq_sta->lq_info[i].is_fat, | 2521 | lq_sta->lq_info[i].is_fat, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index ab599a962874..e971a893eec8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1492,7 +1492,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) | |||
1492 | hw_rf_kill = 1; | 1492 | hw_rf_kill = 1; |
1493 | 1493 | ||
1494 | IWL_DEBUG(IWL_DL_RF_KILL, "RF_KILL bit toggled to %s.\n", | 1494 | IWL_DEBUG(IWL_DL_RF_KILL, "RF_KILL bit toggled to %s.\n", |
1495 | hw_rf_kill ? "disable radio":"enable radio"); | 1495 | hw_rf_kill ? "disable radio" : "enable radio"); |
1496 | 1496 | ||
1497 | /* driver only loads ucode once setting the interface up. | 1497 | /* driver only loads ucode once setting the interface up. |
1498 | * the driver as well won't allow loading if RFKILL is set | 1498 | * the driver as well won't allow loading if RFKILL is set |
@@ -3657,7 +3657,8 @@ static ssize_t show_power_level(struct device *d, | |||
3657 | break; | 3657 | break; |
3658 | } | 3658 | } |
3659 | 3659 | ||
3660 | p += sprintf(p, "\tMODE:%s", (mode < IWL_POWER_AUTO)?"fixed":"auto"); | 3660 | p += sprintf(p, "\tMODE:%s", (mode < IWL_POWER_AUTO) ? |
3661 | "fixed" : "auto"); | ||
3661 | p += sprintf(p, "\tINDEX:%d", level); | 3662 | p += sprintf(p, "\tINDEX:%d", level); |
3662 | p += sprintf(p, "\n"); | 3663 | p += sprintf(p, "\n"); |
3663 | return p - buf + 1; | 3664 | return p - buf + 1; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-hcmd.c index 8300f3d00a06..0008a35232b0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-hcmd.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include "iwl-core.h" | 36 | #include "iwl-core.h" |
37 | 37 | ||
38 | 38 | ||
39 | #define IWL_CMD(x) case x : return #x | 39 | #define IWL_CMD(x) case x: return #x |
40 | 40 | ||
41 | const char *get_cmd_string(u8 cmd) | 41 | const char *get_cmd_string(u8 cmd) |
42 | { | 42 | { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h index 40e0050b7536..bc10435d96e5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-io.h +++ b/drivers/net/wireless/iwlwifi/iwl-io.h | |||
@@ -109,7 +109,7 @@ static inline int __iwl_poll_bit(const char *f, u32 l, | |||
109 | int ret = _iwl_poll_bit(priv, addr, bits, mask, timeout); | 109 | int ret = _iwl_poll_bit(priv, addr, bits, mask, timeout); |
110 | IWL_DEBUG_IO("poll_bit(0x%08X, 0x%08X, 0x%08X) - %s- %s %d\n", | 110 | IWL_DEBUG_IO("poll_bit(0x%08X, 0x%08X, 0x%08X) - %s- %s %d\n", |
111 | addr, bits, mask, | 111 | addr, bits, mask, |
112 | unlikely(ret == -ETIMEDOUT)?"timeout":"", f, l); | 112 | unlikely(ret == -ETIMEDOUT) ? "timeout" : "", f, l); |
113 | return ret; | 113 | return ret; |
114 | } | 114 | } |
115 | #define iwl_poll_bit(priv, addr, bits, mask, timeout) \ | 115 | #define iwl_poll_bit(priv, addr, bits, mask, timeout) \ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 166f0001e01d..d9638d75a970 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
@@ -1498,7 +1498,7 @@ static int iwl_tx_status_reply_compressed_ba(struct iwl_priv *priv, | |||
1498 | ack = bitmap & (1ULL << i); | 1498 | ack = bitmap & (1ULL << i); |
1499 | successes += !!ack; | 1499 | successes += !!ack; |
1500 | IWL_DEBUG_TX_REPLY("%s ON i=%d idx=%d raw=%d\n", | 1500 | IWL_DEBUG_TX_REPLY("%s ON i=%d idx=%d raw=%d\n", |
1501 | ack? "ACK":"NACK", i, (agg->start_idx + i) & 0xff, | 1501 | ack ? "ACK" : "NACK", i, (agg->start_idx + i) & 0xff, |
1502 | agg->start_idx + i); | 1502 | agg->start_idx + i); |
1503 | } | 1503 | } |
1504 | 1504 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 1a923c2fddb0..baa0d6c59d20 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -519,7 +519,7 @@ static inline int iwl3945_is_ready_rf(struct iwl3945_priv *priv) | |||
519 | 519 | ||
520 | /*************** HOST COMMAND QUEUE FUNCTIONS *****/ | 520 | /*************** HOST COMMAND QUEUE FUNCTIONS *****/ |
521 | 521 | ||
522 | #define IWL_CMD(x) case x : return #x | 522 | #define IWL_CMD(x) case x: return #x |
523 | 523 | ||
524 | static const char *get_cmd_string(u8 cmd) | 524 | static const char *get_cmd_string(u8 cmd) |
525 | { | 525 | { |
@@ -4320,7 +4320,7 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv) | |||
4320 | 4320 | ||
4321 | IWL_DEBUG(IWL_DL_INFO | IWL_DL_RF_KILL | IWL_DL_ISR, | 4321 | IWL_DEBUG(IWL_DL_INFO | IWL_DL_RF_KILL | IWL_DL_ISR, |
4322 | "RF_KILL bit toggled to %s.\n", | 4322 | "RF_KILL bit toggled to %s.\n", |
4323 | hw_rf_kill ? "disable radio":"enable radio"); | 4323 | hw_rf_kill ? "disable radio" : "enable radio"); |
4324 | 4324 | ||
4325 | /* Queue restart only if RF_KILL switch was set to "kill" | 4325 | /* Queue restart only if RF_KILL switch was set to "kill" |
4326 | * when we loaded driver, and is now set to "enable". | 4326 | * when we loaded driver, and is now set to "enable". |