From nobody Thu Jun 18 18:45:41 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21A38C433EF for ; Sat, 16 Apr 2022 08:01:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230259AbiDPIDf (ORCPT ); Sat, 16 Apr 2022 04:03:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230236AbiDPID2 (ORCPT ); Sat, 16 Apr 2022 04:03:28 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6039222BDB for ; Sat, 16 Apr 2022 01:00:54 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id c64so12206540edf.11 for ; Sat, 16 Apr 2022 01:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=/eHNQjz4f79BR4/ytGgYvqcYT3Mpa3ln0lhSc14HpYY=; b=RB39KqfDVLTc3vVHvaNdKfNaIzsU+s2zPd2pLpxal8+wZyOuu1AijiChM6R0oXAie/ XPc3IOaSfNmNJ4RqM5TflHFeOtjMd9iYypQGbB9wFAmvXD3BHA1taluEnwb1fvJOHkLi I97y+1t4u9Y1Abuj0WISmBuH07jwL44RbvaT3bmhtVfwU008OpFLxPtHFp5zrEVbfPl7 0DRYsK5yUmFTQAj1Bdlr6iqMSW1j+IKAkIpozdZZlv3oqpq1Ejirjn0UHguu0m1VY1oV F6Rr/CUtl1XJINC1fTJluFBQyIDtazV5gbOSmV5+8wO4lAmOkc08cPxuZBXsvrF4TwsJ oRwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/eHNQjz4f79BR4/ytGgYvqcYT3Mpa3ln0lhSc14HpYY=; b=j7nfbauQoyZgNhmHwbIhmDCS6W9Uyg+AbEwUoeyy9YYjjUm+5NlbQLYv/RQOJ0a6SH FvW6neH/fAH9oEnneByTUT56Nh8zzew1BArD539tZcGQ1HIPUlMeBdjc/dVaYXAchBRx yCmaothefRdkns1KeDznY/ol3rcwQzVKF9bJJYY0Q7DP44xRFpP9kiBdnngmHVdxx1F1 olS69aiL45QUJ1c8QOvcTgEYcmmKzEbfpwy33xEf+jRgAR8CLsyC8yJ3cCi/OiBERrhQ z1veWa672guQcQXhWS7EFgfNEZRq3RSfXEx4UqZeU2X4SfltZvRR6Nw5KSi2z5w9xpfz 04Nw== X-Gm-Message-State: AOAM533Pp6Sh+edx38N2ICrS3HZ2CLsyvkEWmz2QiSR9eAe9BhMNc4Y/ Qjfi449YCH7qIvH2vl3uwlEBrU0Wf6k= X-Google-Smtp-Source: ABdhPJwO2PmLCY9irpkH2G8a0NtCiv1GAxfZC58sdbmmimQ6EyinxYr6VyR+3jbrn0+2H6i6opuz4A== X-Received: by 2002:a50:c014:0:b0:41d:5ee9:f354 with SMTP id r20-20020a50c014000000b0041d5ee9f354mr2708599edb.257.1650096053105; Sat, 16 Apr 2022 01:00:53 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id f4-20020a170906c08400b006e82dbd3f6esm2400805ejz.116.2022.04.16.01.00.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 01:00:52 -0700 (PDT) Date: Sat, 16 Apr 2022 10:00:50 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] staging: vt6655: Replace MACvGPIOIn with VNSvInPortB Message-ID: <0a3c3eb0d4dad544fa281b34c5a70d4a3ab2d9f1.1650094595.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace macro MACvGPIOIn with VNSvInPortB. Next patch will replace all macros VNSvInPortB with ioread8. The names of macros and the arguments use CamelCase which is not accepted by checkpatch.pl Since there are more than one checkpatch issue per line, more steps are rquired to fix. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 897d70cf32b8..8b6efe2126ac 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -377,7 +377,7 @@ static void device_init_registers(struct vnt_private *p= riv) =20 if (priv->byRadioCtl & EEP_RADIOCTL_ENABLE) { /* Get GPIO */ - MACvGPIOIn(priv->port_offset, &priv->byGPIO); + VNSvInPortB(priv->port_offset + MAC_REG_GPIOCTL1, &priv->byGPIO); =20 if (((priv->byGPIO & GPIO0_DATA) && !(priv->byRadioCtl & EEP_RADIOCTL_INV)) || diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 6221351c6400..a5ce084f6961 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -735,9 +735,6 @@ do { \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) =20 -#define MACvGPIOIn(iobase, pbyValue) \ - VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue) - #define MACvSetRFLE_LatchBase(iobase) \ MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) =20 --=20 2.25.1 From nobody Thu Jun 18 18:45:41 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65D8CC433EF for ; Sat, 16 Apr 2022 08:01:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230202AbiDPIDj (ORCPT ); Sat, 16 Apr 2022 04:03:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230244AbiDPIDc (ORCPT ); Sat, 16 Apr 2022 04:03:32 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC0553DA40 for ; Sat, 16 Apr 2022 01:00:59 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id u15so18762162ejf.11 for ; Sat, 16 Apr 2022 01:00:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=2OH6YITjPCmzx/9D8LSWWvC6onzpDes2kY/eqgyLQz4=; b=Ee7iIPUesrmyUCSTujUbLLiY3m9W8or5mgfAzKyHrxJbZMqyZRmrNT2+DySPyHAm+l zo30AOrnr4ZZo0bekpECGexo1MJ7K/og6jNpKrBL9QF3Rg1P6vKTWqG5ccFwA1H67WQQ VkT9OmrXBw9h80whkWVkz6pHivbeIr3jOWr7/Mltko0C2P4NgySaM68Df7Tr2q+mXiWD Q5beM767f62LWg/H63p5WrwC8duw7uvbftB72QKYG59rBxRmRRe2uF38QzcEG63vnuyH RSJz2i0wWk2FKB7riA9RaLTEa5f1vRq2RxlneMGuQC2cv5RPiStYFPjPxVGvJ/OG4bQh hnJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=2OH6YITjPCmzx/9D8LSWWvC6onzpDes2kY/eqgyLQz4=; b=el2/A4Tlu4DKkAbF1vrh8ht7ojBZv6lDOh9DW4tsbVKhghG14kK6qaM/9nEMiUmzbn n0cuUa+dfXKhh2s5NS8ORAV//N0P+oykVRL8h8Ihmse94kyJL1vvpJOsZJjm05E73lZ0 oGp4Du9uHCMcNSGOodxaAh470DmwjuJgt/7qxFW8Vfr/Eb7o9Av6wjplpjrtRJ3nsYri uhKfwsdS/nzHgY0GZW1R9291VvKVmkCN6tWzf3fBrYTd0TuYPqdgE6WB9olabgXD8wVG nloWMAb5St4Gk/aVOo7FH1cshpZi1HRu81PuHI3Vv52Zli5AEv8MhjyVRLU9oYO7KpmK tuYg== X-Gm-Message-State: AOAM530IbkQ3F34w+4YqO8ogGV4ldPR7ZND2uZxy1Ce4BebnH4m2Iui3 JLTtjDRog3WqCCbU3aplLDk= X-Google-Smtp-Source: ABdhPJyWU5LmL0P/c02r2032sXpfDJt3T71kyZZe77iCYRjT9cW73cKyoMUjDshCyGGzhEHfEdozKg== X-Received: by 2002:a17:907:6e1e:b0:6ef:5a59:2bd4 with SMTP id sd30-20020a1709076e1e00b006ef5a592bd4mr1992400ejc.143.1650096058299; Sat, 16 Apr 2022 01:00:58 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id f10-20020a056402328a00b0041f7a15a59fsm3664772eda.16.2022.04.16.01.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Apr 2022 01:00:57 -0700 (PDT) Date: Sat, 16 Apr 2022 10:00:55 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] staging: vt6655: Replace VNSvInPortB with ioread8 Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace macro VNSvInPortB with ioread8. Avoid cast of the return value is possible with one exception. The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl Since there are more than one checkpatch issue per line, more steps are rquired to fix. Signed-off-by: Philipp Hortmann --- V1 -> V2: This patch was 4/7 and is now 3/6 V2 -> V3: Changed from rename macro arguments to replace macro VNSvInPortB with ioread8 This patch was 3/6 and is now 1/7 V3 -> V4: Replacement now without a cast of the return value with only one exception. Note: The one casting exception could be removed by changing bb_read_embedded. Instead of having a unused return value bool the return value could be an unsigned char. --- drivers/staging/vt6655/baseband.c | 6 +++--- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device_main.c | 6 +++--- drivers/staging/vt6655/mac.h | 24 +++++++++--------------- drivers/staging/vt6655/srom.c | 6 +++--- drivers/staging/vt6655/upc.h | 3 --- 6 files changed, 19 insertions(+), 28 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/bas= eband.c index dfdb0ebf43b5..decb55e96f02 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1916,13 +1916,13 @@ bool bb_read_embedded(struct vnt_private *priv, uns= igned char by_bb_addr, MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR); /* W_MAX_TIMEOUT is the timeout period */ for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { - VNSvInPortB(iobase + MAC_REG_BBREGCTL, &by_value); + by_value =3D ioread8(iobase + MAC_REG_BBREGCTL); if (by_value & BBREGCTL_DONE) break; } =20 /* get BB data */ - VNSvInPortB(iobase + MAC_REG_BBREGDATA, pby_data); + *pby_data =3D ioread8(iobase + MAC_REG_BBREGDATA); =20 if (ww =3D=3D W_MAX_TIMEOUT) { pr_debug(" DBG_PORT80(0x30)\n"); @@ -1961,7 +1961,7 @@ bool bb_write_embedded(struct vnt_private *priv, unsi= gned char by_bb_addr, MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW); /* W_MAX_TIMEOUT is the timeout period */ for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { - VNSvInPortB(iobase + MAC_REG_BBREGCTL, &by_value); + by_value =3D ioread8(iobase + MAC_REG_BBREGCTL); if (by_value & BBREGCTL_DONE) break; } diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 1110366fc415..1ccf08b1fd5c 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -748,7 +748,7 @@ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *= pqwCurrTSF) =20 MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { - VNSvInPortB(iobase + MAC_REG_TFTCTL, &data); + data =3D ioread8(iobase + MAC_REG_TFTCTL); if (!(data & TFTCTL_TSFCNTRRD)) break; } diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 8b6efe2126ac..08b955c71b3c 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -219,7 +219,7 @@ static void device_init_registers(struct vnt_private *p= riv) MACvInitialize(priv); =20 /* Get Local ID */ - VNSvInPortB(priv->port_offset + MAC_REG_LOCALID, &priv->local_id); + priv->local_id =3D ioread8(priv->port_offset + MAC_REG_LOCALID); =20 spin_lock_irqsave(&priv->lock, flags); =20 @@ -377,7 +377,7 @@ static void device_init_registers(struct vnt_private *p= riv) =20 if (priv->byRadioCtl & EEP_RADIOCTL_ENABLE) { /* Get GPIO */ - VNSvInPortB(priv->port_offset + MAC_REG_GPIOCTL1, &priv->byGPIO); + priv->byGPIO =3D ioread8(priv->port_offset + MAC_REG_GPIOCTL1); =20 if (((priv->byGPIO & GPIO0_DATA) && !(priv->byRadioCtl & EEP_RADIOCTL_INV)) || @@ -1513,7 +1513,7 @@ static void vnt_configure(struct ieee80211_hw *hw, =20 *total_flags &=3D FIF_ALLMULTI | FIF_OTHER_BSS | FIF_BCN_PRBRESP_PROMISC; =20 - VNSvInPortB(priv->port_offset + MAC_REG_RCR, &rx_mode); + rx_mode =3D ioread8(priv->port_offset + MAC_REG_RCR); =20 dev_dbg(&priv->pcid->dev, "rx mode in =3D %x\n", rx_mode); =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index a5ce084f6961..4d8496024abf 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -541,7 +541,7 @@ #define MACvRegBitsOn(iobase, byRegOfs, byBits) \ do { \ unsigned char byData; \ - VNSvInPortB(iobase + byRegOfs, &byData); \ + byData =3D ioread8(iobase + byRegOfs); \ VNSvOutPortB(iobase + byRegOfs, byData | (byBits)); \ } while (0) =20 @@ -555,7 +555,7 @@ do { \ #define MACvRegBitsOff(iobase, byRegOfs, byBits) \ do { \ unsigned char byData; \ - VNSvInPortB(iobase + byRegOfs, &byData); \ + byData =3D ioread8(iobase + byRegOfs); \ VNSvOutPortB(iobase + byRegOfs, byData & ~(byBits)); \ } while (0) =20 @@ -597,18 +597,12 @@ do { \ #define MACvReadEtherAddress(iobase, pbyEtherAddr) \ do { \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ - VNSvInPortB(iobase + MAC_REG_PAR0, \ - (unsigned char *)pbyEtherAddr); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 1, \ - pbyEtherAddr + 1); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 2, \ - pbyEtherAddr + 2); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 3, \ - pbyEtherAddr + 3); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 4, \ - pbyEtherAddr + 4); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 5, \ - pbyEtherAddr + 5); \ + pbyEtherAddr[0] =3D ioread8(iobase + MAC_REG_PAR0); \ + pbyEtherAddr[1] =3D ioread8(iobase + MAC_REG_PAR0 + 1); \ + pbyEtherAddr[2] =3D ioread8(iobase + MAC_REG_PAR0 + 2); \ + pbyEtherAddr[3] =3D ioread8(iobase + MAC_REG_PAR0 + 3); \ + pbyEtherAddr[4] =3D ioread8(iobase + MAC_REG_PAR0 + 4); \ + pbyEtherAddr[5] =3D ioread8(iobase + MAC_REG_PAR0 + 5); \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ } while (0) =20 @@ -668,7 +662,7 @@ do { \ #define MACvClearStckDS(iobase) \ do { \ unsigned char byOrgValue; \ - VNSvInPortB(iobase + MAC_REG_STICKHW, &byOrgValue); \ + byOrgValue =3D ioread8(iobase + MAC_REG_STICKHW); \ byOrgValue =3D byOrgValue & 0xFC; \ VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue); \ } while (0) diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 63f62b0e2db8..84ec9eb8cdd3 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -66,7 +66,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, unsigned char byOrg; =20 byData =3D 0xFF; - VNSvInPortB(iobase + MAC_REG_I2MCFG, &byOrg); + byOrg =3D ioread8(iobase + MAC_REG_I2MCFG); /* turn off hardware retry for getting NACK */ VNSvOutPortB(iobase + MAC_REG_I2MCFG, (byOrg & (~I2MCFG_NORETRY))); for (wNoACK =3D 0; wNoACK < W_MAX_I2CRETRY; wNoACK++) { @@ -77,7 +77,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, VNSvOutPortB(iobase + MAC_REG_I2MCSR, I2MCSR_EEMR); /* wait DONE be set */ for (wDelay =3D 0; wDelay < W_MAX_TIMEOUT; wDelay++) { - VNSvInPortB(iobase + MAC_REG_I2MCSR, &byWait); + byWait =3D ioread8(iobase + MAC_REG_I2MCSR); if (byWait & (I2MCSR_DONE | I2MCSR_NACK)) break; udelay(CB_DELAY_LOOP_WAIT); @@ -87,7 +87,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, break; } } - VNSvInPortB(iobase + MAC_REG_I2MDIPT, &byData); + byData =3D ioread8(iobase + MAC_REG_I2MDIPT); VNSvOutPortB(iobase + MAC_REG_I2MCFG, byOrg); return byData; } diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 6bc2be0bf4f0..d2c1528c8e1b 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,9 +20,6 @@ =20 /* For memory mapped IO */ =20 -#define VNSvInPortB(dwIOAddress, pbyData) \ - (*(pbyData) =3D ioread8(dwIOAddress)) - #define VNSvInPortW(dwIOAddress, pwData) \ (*(pwData) =3D ioread16(dwIOAddress)) =20 --=20 2.25.1