iwlwifi: mei: avoid -Wpointer-arith and -Wcast-qual warnings

These cause extra warnings (at least with W=3), avoid them.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220130115024.59d00c6e5f09.I331bf18af0b80b5cc41b379ff0cc1b26a89dd915@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c
index d9733aaf6f6e94e63b10a2d4229898f1596efb1b..8295cbbb497c743405d802b1b75bafe278b96f24 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mei/main.c
+++ b/drivers/net/wireless/intel/iwlwifi/mei/main.c
@@ -312,7 +312,7 @@ static ssize_t iwl_mei_write_cyclic_buf(struct mei_cl_device *cldev,
                memcpy(q_head + wr, hdr, tx_sz);
        } else {
                memcpy(q_head + wr, hdr, q_sz - wr);
-               memcpy(q_head, (u8 *)hdr + q_sz - wr, tx_sz - (q_sz - wr));
+               memcpy(q_head, (const u8 *)hdr + q_sz - wr, tx_sz - (q_sz - wr));
        }
 
        WRITE_ONCE(notif_q->wr_ptr, cpu_to_le32((wr + tx_sz) % q_sz));
@@ -432,7 +432,7 @@ void iwl_mei_add_data_to_ring(struct sk_buff *skb, bool cb_tx)
        u32 q_sz;
        u32 rd;
        u32 wr;
-       void *q_head;
+       u8 *q_head;
 
        if (!iwl_mei_global_cldev)
                return;

diff --git a/drivers/net/wireless/intel/iwlwifi/mei/net.c b/drivers/net/wireless/intel/iwlwifi/mei/net.c
index 5f966af6972000ffe4873ac9a55191653baf8948..fa2dbdca55924f4c5eb5a7b6d06811754c22b3ec 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mei/net.c
+++ b/drivers/net/wireless/intel/iwlwifi/mei/net.c
@@ -102,8 +102,8 @@ static bool iwl_mei_rx_filter_arp(struct sk_buff *skb,
         * src IP address    - 4 bytes
         * target MAC addess - 6 bytes
         */
-       target_ip = (void *)((u8 *)(arp + 1) +
-                            ETH_ALEN + sizeof(__be32) + ETH_ALEN);
+       target_ip = (const void *)((const u8 *)(arp + 1) +
+                                  ETH_ALEN + sizeof(__be32) + ETH_ALEN);
 
        /*
         * ARP request is forwarded to ME only if IP address match in the