Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp399304pxb; Tue, 1 Feb 2022 02:18:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJyj26cn8jzmVhkVMl/LBHsuK3M8+vBhq9mUAXbcABFRLAde7LQmb+vTELJK3UmAO9CiK8NH X-Received: by 2002:a05:6a00:80d:: with SMTP id m13mr24424746pfk.48.1643710682164; Tue, 01 Feb 2022 02:18:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643710682; cv=none; d=google.com; s=arc-20160816; b=H9u4v2YTEmo2cGUGCxxyzMAAZpRQ8ZIuj1KYH3D4n9LJlg2ur7PVt/pGAsbAGHUhmU LP8lhQvA/aWo03B0bA15TLMIix3/ucImT2yIc/Uzns8rGfLvXblqLhyNYnLYU1iKDilI iP8o9z6B19vmzY81QQvKxEKR8C40r+6+0SOpmBxrMzsfbp3lYhjB/guaJxYQhrqB9u77 vckgifmuMf1TLe1RMkca+Ns+qIySDv62D5U9N7GWaDii4vHnCErYo/2UEplAFdpmtYMI 9dnLA/qVOx4Kxtwu0O1dBEh5VCiKl+4wn750nEG8u8AVLcQ9f/km7dtfJXb16+zMwYGH oC4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=RXZH0kPW2XBfUt46FCUIZU+YJa930kr0NTEZzDSp3Ow=; b=CWRDlmSZ1wk/xeDsD72NPS7QMJL9j80FDooLVaI2908suS7x+OkDk2WSD3E6H7DWy3 dlrWTujUNhhpfxzBBQKClKUeyXsUG1rS9GDroLkAg0MCXd8diQsuBHW5pEsgqV3vCOZg Eg/Y85yQ/Ui59sheW3UZBvWx56agl/6fx1RjzkfRCOF5ZFgcCIMM9Jg847O4CDrT+RcP NI0LatBMpct173YPpMGmdkjyn4AFQwUdesboXc8gM837y6XniAyxemYATv+QgOKsQb9z u2xBHWjwpReJs51ckrAevjt28WffQOFNIYEMLK7fdMzsZBOvRcWKkH1KcZAsBmUK+xb6 Blpw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v12si16766687plg.385.2022.02.01.02.17.53; Tue, 01 Feb 2022 02:18:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354551AbiA3JxS (ORCPT + 71 others); Sun, 30 Jan 2022 04:53:18 -0500 Received: from paleale.coelho.fi ([176.9.41.70]:37918 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1354542AbiA3JxR (ORCPT ); Sun, 30 Jan 2022 04:53:17 -0500 Received: from 91-156-4-210.elisa-laajakaista.fi ([91.156.4.210] helo=kveik.lan) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1nE6tX-0003JO-MM; Sun, 30 Jan 2022 11:53:16 +0200 From: Luca Coelho To: kvalo@kernel.org Cc: luca@coelho.fi, linux-wireless@vger.kernel.org Date: Sun, 30 Jan 2022 11:53:05 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130095306.790573-1-luca@coelho.fi> References: <20220130095306.790573-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH 11/12] iwlwifi: mei: avoid -Wpointer-arith and -Wcast-qual warnings Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg These cause extra warnings (at least with W=3), avoid them. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/mei/main.c | 4 ++-- drivers/net/wireless/intel/iwlwifi/mei/net.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c index d9733aaf6f6e..8295cbbb497c 100644 --- 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 5f966af69720..fa2dbdca5592 100644 --- 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 -- 2.34.1