iwmc3200wifi: Fix sparse warnings

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 5090a8a618875d31e26ae88aca62e832cf512a51..d754c3bc323a952f43a9bdfb3dfe5c0dd651c665 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -430,7 +430,8 @@ static int iwm_ntf_rx_ticket(struct iwm_priv *iwm, u8 *buf,
                                return PTR_ERR(ticket_node);
 
                        IWM_DBG_RX(iwm, DBG, "TICKET %s(%d)\n",
-                                  ticket->action ==  IWM_RX_TICKET_RELEASE ?
+                                  __le16_to_cpu(ticket->action) ==
+                                                       IWM_RX_TICKET_RELEASE ?
                                   "RELEASE" : "DROP",
                                   ticket->id);
                        spin_lock(&iwm->ticket_lock);

diff --git a/drivers/net/wireless/iwmc3200wifi/trace.h b/drivers/net/wireless/iwmc3200wifi/trace.h
index 320e54fbb38cbdc570d62c4b3b106677a53c061a..abb4805fa8dfe2b82d8aee77ece564524ca7f596 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/trace.h
+++ b/drivers/net/wireless/iwmc3200wifi/trace.h
@@ -76,7 +76,7 @@ TRACE_EVENT(iwm_tx_wifi_cmd,
                IWM_ASSIGN;
                __entry->opcode = hdr->sw_hdr.cmd.cmd;
                __entry->lmac = 0;
-               __entry->seq = hdr->sw_hdr.cmd.seq_num;
+               __entry->seq = __le16_to_cpu(hdr->sw_hdr.cmd.seq_num);
                __entry->resp = GET_VAL8(hdr->sw_hdr.cmd.flags, UMAC_DEV_CMD_FLAGS_RESP_REQ);
                __entry->color = GET_VAL32(hdr->sw_hdr.meta_data, UMAC_FW_CMD_TX_STA_COLOR);
                __entry->eot = GET_VAL32(hdr->hw_hdr.cmd, UMAC_HDI_OUT_CMD_EOT);
@@ -123,7 +123,7 @@ TRACE_EVENT(iwm_tx_packets,
                __entry->ra_tid = GET_VAL32(hdr->hw_hdr.meta_data, UMAC_HDI_OUT_RATID);
                __entry->credit_group = GET_VAL32(hdr->hw_hdr.meta_data, UMAC_HDI_OUT_CREDIT_GRP);
                __entry->color = GET_VAL32(hdr->sw_hdr.meta_data, UMAC_FW_CMD_TX_STA_COLOR);
-               __entry->seq = hdr->sw_hdr.cmd.seq_num;
+               __entry->seq = __le16_to_cpu(hdr->sw_hdr.cmd.seq_num);
                __entry->npkt = 1;
                __entry->bytes = len;
 

diff --git a/drivers/net/wireless/iwmc3200wifi/tx.c b/drivers/net/wireless/iwmc3200wifi/tx.c
index a20b936ae21f55393d9ccf742d135e9c5c187552..3cfa7b81fef23c0255d9849577d29a749e27f0c7 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/tx.c
+++ b/drivers/net/wireless/iwmc3200wifi/tx.c
@@ -301,8 +301,8 @@ void iwm_tx_credit_init_pools(struct iwm_priv *iwm,
 
 #define IWM_UDMA_HDR_LEN       sizeof(struct iwm_umac_wifi_out_hdr)
 
-static int iwm_tx_build_packet(struct iwm_priv *iwm, struct sk_buff *skb,
-                              int pool_id, u8 *buf)
+static __le16 iwm_tx_build_packet(struct iwm_priv *iwm, struct sk_buff *skb,
+                                 int pool_id, u8 *buf)
 {
        struct iwm_umac_wifi_out_hdr *hdr = (struct iwm_umac_wifi_out_hdr *)buf;
        struct iwm_udma_wifi_cmd udma_cmd;