mwifiex: fix checkpatch --strict warnings/errors Part 9

[pandora-kernel.git] / drivers / net / wireless / mwifiex / sta_tx.c

diff --git a/drivers/net/wireless/mwifiex/sta_tx.c b/drivers/net/wireless/mwifiex/sta_tx.c
index 94d31a9..7af534f 100644 (file)
--- a/drivers/net/wireless/mwifiex/sta_tx.c
+++ b/drivers/net/wireless/mwifiex/sta_tx.c
@@ -50,8 +50,7 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,
        u8 pad;
 
        if (!skb->len) {
-               dev_err(adapter->dev, "Tx: bad packet length: %d\n",
-                      skb->len);
+               dev_err(adapter->dev, "Tx: bad packet length: %d\n", skb->len);
                tx_info->status_code = -1;
                return skb->data;
        }
@@ -60,19 +59,20 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,
        pad = (4 - (((void *)skb->data - NULL) & 0x3)) % 4;
 
        BUG_ON(skb_headroom(skb) < (sizeof(*local_tx_pd) + INTF_HEADER_LEN
-                                                               + pad));
+                                   + pad));
        skb_push(skb, sizeof(*local_tx_pd) + pad);
 
        local_tx_pd = (struct txpd *) skb->data;
        memset(local_tx_pd, 0, sizeof(struct txpd));
        local_tx_pd->bss_num = priv->bss_num;
        local_tx_pd->bss_type = priv->bss_type;
-       local_tx_pd->tx_pkt_length = cpu_to_le16((u16) (skb->len -
-                                               (sizeof(struct txpd) + pad)));
+       local_tx_pd->tx_pkt_length = cpu_to_le16((u16)(skb->len -
+                                                      (sizeof(struct txpd)
+                                                       + pad)));
 
        local_tx_pd->priority = (u8) skb->priority;
        local_tx_pd->pkt_delay_2ms =
-               mwifiex_wmm_compute_drv_pkt_delay(priv, skb);
+                               mwifiex_wmm_compute_drv_pkt_delay(priv, skb);
 
        if (local_tx_pd->priority <
            ARRAY_SIZE(priv->wmm.user_pri_pkt_tx_ctrl))
@@ -82,7 +82,7 @@ void *mwifiex_process_sta_txpd(struct mwifiex_private *priv,
                 */
                local_tx_pd->tx_control =
                        cpu_to_le32(priv->wmm.user_pri_pkt_tx_ctrl[local_tx_pd->
-                                                        priority]);
+                                                                  priority]);
 
        if (adapter->pps_uapsd_mode) {
                if (mwifiex_check_last_packet_indication(priv)) {
@@ -160,13 +160,13 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags)
        case -1:
                dev_kfree_skb_any(skb);
                dev_err(adapter->dev, "%s: host_to_card failed: ret=%d\n",
-                                               __func__, ret);
+                       __func__, ret);
                adapter->dbg.num_tx_host_to_card_failure++;
                break;
        case 0:
                dev_kfree_skb_any(skb);
                dev_dbg(adapter->dev, "data: %s: host_to_card succeeded\n",
-                                               __func__);
+                       __func__);
                adapter->tx_lock_flag = true;
                break;
        case -EINPROGRESS:
@@ -192,8 +192,8 @@ mwifiex_check_last_packet_indication(struct mwifiex_private *priv)
        if (mwifiex_wmm_lists_empty(adapter))
                        ret = true;
 
-       if (ret && !adapter->cmd_sent && !adapter->curr_cmd
-           && !is_command_pending(adapter)) {
+       if (ret && !adapter->cmd_sent && !adapter->curr_cmd &&
+           !is_command_pending(adapter)) {
                adapter->delay_null_pkt = false;
                ret = true;
        } else {