From nobody Mon May 11 07:45:47 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 BA11BC433FE for ; Mon, 11 Apr 2022 20:49:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349949AbiDKUvn (ORCPT ); Mon, 11 Apr 2022 16:51:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237273AbiDKUvj (ORCPT ); Mon, 11 Apr 2022 16:51:39 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48D5B13F12 for ; Mon, 11 Apr 2022 13:49:24 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id bh17so33310167ejb.8 for ; Mon, 11 Apr 2022 13:49:24 -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=dWNuoN45sTUkZkT5Ou1BRhQysWHb8DTjQZwdAQKOIe8=; b=UXsbplgyyWQgfElwHXtIoOaGmf0A25proLl02YtSj19BiJzN/XpseXCi04U75Lwwtj uXK5uSbc4TkHFxFF3M9N3AC9TQQ7Vcqof5DbKF6oyw8bT+MiCiB+vMZbh31nWodi5eFc 8HYVWs0lhijSng4IjdguEnqdwkOd/u2mB0cz17eT3JbosupyGvWNzfI2iQPJlcCXMVbC L+8nqcQ+zXW1YqAJbcKD+0dR4cf3LF7lqPOSZAT3AOcRyhdrEVK6wwmeHLRRQY4bYTiw gVSSCeYHNuspLbFOJm2e9MR9kmzEZdo69bY4q+ICW4BE+mRHYlcCSckSZ5Ay0m3cNKwm 9wfA== 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=dWNuoN45sTUkZkT5Ou1BRhQysWHb8DTjQZwdAQKOIe8=; b=4ww7/1Ls2FQWaZFo4o6pXI5rg8Ugl2gQ3oNnHxPPkGamKiwmHWo3QgXzShNDXFgRr/ eDsmgMlx+KPKTcISxnco7HXEp7FhsKOehD9kDHotYlcxBZGaV97mZsGSXP+uFaIf7QnO LuT+ZAHbvrms6g3xMgqa0jHd+4K070Y7mFl27XBfaR9Kk+WAEzYhp0fIOJ7laW4Guajq LJ3xxjvEXsPlOu5YOAZMD1oBsw1cw+0s7NNSvrhl+Nm04o8GsjqwNVw9kAiw7xmaatZi ouvMVyitpMLKdzPx76irDki/pd+WFx3b3o11P9egvpL09YxozGHCdpkatmUhflegn7Eu I/MA== X-Gm-Message-State: AOAM533le3Przps9PzvadcjwRi8syKUcwaW/MI7pmCa4nmHbwSDHMSGj dn4tD4RvuK/l2/1pWLNXv3k= X-Google-Smtp-Source: ABdhPJx6OeiftYzAEkZf0Qv3k/sEKVHPwn5HgYMlHpKkBbPqeq8L+BacW9FqbcXO9dFNEd6HZsNptQ== X-Received: by 2002:a17:907:96a9:b0:6e0:db4a:ba8d with SMTP id hd41-20020a17090796a900b006e0db4aba8dmr32664707ejc.87.1649710162712; Mon, 11 Apr 2022 13:49:22 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id d1-20020a50fe81000000b004197f2ecdc2sm15568391edt.89.2022.04.11.13.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 13:49:22 -0700 (PDT) Date: Mon, 11 Apr 2022 22:49:20 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/7] staging: vt6655: Replace VNSvInPortB with ioread8 Message-ID: <2f1392d831d005709c859aedf75de7e7ca2269cf.1649706687.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 VNSvInPortB with ioread8. 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 --- drivers/staging/vt6655/baseband.c | 6 +++--- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device_main.c | 4 ++-- drivers/staging/vt6655/mac.h | 26 ++++++++++---------------- 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 897d70cf32b8..16b031c31925 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 @@ -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 6221351c6400..88bf5dba9b43 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); \ + (*((unsigned char *)pbyEtherAddr) =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) @@ -736,7 +730,7 @@ do { \ } while (0) =20 #define MACvGPIOIn(iobase, pbyValue) \ - VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue) + *(pbyValue) =3D ioread8(iobase + MAC_REG_GPIOCTL1) =20 #define MACvSetRFLE_LatchBase(iobase) \ MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 5cdbc24e8c45..a0432bacb6a0 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; PCAvDelayByIO(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 b374db5fca81..44d746de6344 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 From nobody Mon May 11 07:45:47 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 20EC6C433EF for ; Mon, 11 Apr 2022 20:49:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349957AbiDKUvw (ORCPT ); Mon, 11 Apr 2022 16:51:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349956AbiDKUvu (ORCPT ); Mon, 11 Apr 2022 16:51:50 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9781B14086 for ; Mon, 11 Apr 2022 13:49:32 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id u15so14691347ejf.11 for ; Mon, 11 Apr 2022 13:49:32 -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=31uCAJiyq7QrqdMYo3XU+OFlXDPDCua4Bs/5v7Ob/uo=; b=EMyoI33OZNOXsnQUqwxuKbE/1kfi8pvyYRP4JJOnqqBLguymIjgREKWey3l0nWGvDX e0bkvT/9nwkF1b+kCDvvRu1OK8CpzYVPj0P+EAZpkAq8EIQg0jJx7WRYxasMNJkA6wqI HZ1Z9kVgu4kEbPGlKbOCK9fjua0jmgJaVOdanwbfjCtEoCky1RQhq+kEvcxRriuKX09Y vYFLUx5lv5JR7G4I63cy4Zzw7R8szLmWIbYlDNsry1zM3475v+7xvhuung8JvlsN+dvt CEGUo4Klppdyx/LhK9civ4v5Gudvp57ylpazZ4OqJKOAfqO+hq/YoSw2Vlv50nI6k5cj l0yw== 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=31uCAJiyq7QrqdMYo3XU+OFlXDPDCua4Bs/5v7Ob/uo=; b=1pK4ZVrbnMwM4AHykJZMx+Yt/N0ksbCB/0WPnxFBv/XYX8eRUuEpCLrSgX7dBeHZhb z66T4H2Li06eaeTUfM8ESt07pcySvYWFMgo0YUzIAfHBOVztQ4cYYDpqdx7dI5zcDsPf +l+v7ThOh+aGPKR0t6w8jGeytxnOBFPm3Ytmpou2J1B4YIl4XsHe2T760vu5PhH7a7Gc ARRBhqxHXC4bQowNkRQLS6IYfCsEEOlZDQy/xsxq0e+G+MInuZL2yxcqnX1I4xltkVch uiwLJNk15QqYPJTMmqkpjQmVBhNqWB299a3olELLYtKBVNTvUFNcSjJuscb8T4ztWrHB VD/Q== X-Gm-Message-State: AOAM533pjJABvaodRGCvGlzuUG8A+gX8T5SrEp7TqNUoWWdByN+QLVxK Ffclrz1RA7n6b/AoTdI5Cog= X-Google-Smtp-Source: ABdhPJxJodTfjny+R0IqyIY3sjWc/vYuaDggsMt+TWW/Kj586hiQH9QbVCdBx1cD1jnems7PZiFqXg== X-Received: by 2002:a17:907:d20:b0:6e8:4090:b9db with SMTP id gn32-20020a1709070d2000b006e84090b9dbmr20044655ejc.480.1649710170959; Mon, 11 Apr 2022 13:49:30 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id e11-20020a50becb000000b0041b64129200sm16222363edk.50.2022.04.11.13.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 13:49:30 -0700 (PDT) Date: Mon, 11 Apr 2022 22:49:28 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/7] staging: vt6655: Replace VNSvInPortW with ioread16 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 VNSvInPortW with ioread16. 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 5/7 and is now 4/6 V2 -> V3: Changed from "Rename macros VNSvInPortB,W,D with CamelCase ..." to Replace VNSvInPortW with ioread16 This patch was 4/6 and is now 2/7 --- drivers/staging/vt6655/mac.h | 4 ++-- drivers/staging/vt6655/upc.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 88bf5dba9b43..4e7875ff9ff3 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -548,7 +548,7 @@ do { \ #define MACvWordRegBitsOn(iobase, byRegOfs, wBits) \ do { \ unsigned short wData; \ - VNSvInPortW(iobase + byRegOfs, &wData); \ + wData =3D ioread16(iobase + byRegOfs); \ VNSvOutPortW(iobase + byRegOfs, wData | (wBits)); \ } while (0) =20 @@ -562,7 +562,7 @@ do { \ #define MACvWordRegBitsOff(iobase, byRegOfs, wBits) \ do { \ unsigned short wData; \ - VNSvInPortW(iobase + byRegOfs, &wData); \ + wData =3D ioread16(iobase + byRegOfs); \ VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \ } while (0) =20 diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 44d746de6344..99bf7aeb56f7 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,9 +20,6 @@ =20 /* For memory mapped IO */ =20 -#define VNSvInPortW(dwIOAddress, pwData) \ - (*(pwData) =3D ioread16(dwIOAddress)) - #define VNSvInPortD(dwIOAddress, pdwData) \ (*(pdwData) =3D ioread32(dwIOAddress)) =20 --=20 2.25.1 From nobody Mon May 11 07:45:47 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 0A4A4C433EF for ; Mon, 11 Apr 2022 20:49:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349971AbiDKUv5 (ORCPT ); Mon, 11 Apr 2022 16:51:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349956AbiDKUvx (ORCPT ); Mon, 11 Apr 2022 16:51:53 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 842F013F12 for ; Mon, 11 Apr 2022 13:49:37 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id w18so19940019edi.13 for ; Mon, 11 Apr 2022 13:49:37 -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=H2scwZEssf4kDEsnRwZq/AbY5fk4ixKF47JMY7rSlEQ=; b=Ku/4xZFqcNw89GUMyDE8v8NmN83fUs9JW226tYL05IxaN2gv6Oix0IkmZlqK2Ob79g 90Mc7obM9F4F+Krxr/61hf129sKWBfNDd7zmLyCQRsCUUbPql61VUQoYtUO3ikyod9ip ncUDKmwAO0Rft1ycbQwkUbm3keAVhUZmsGgr1KOYlTt4qVkkfAO0bAQ7NIP7VT49LuhV 3Ox2VPZS3fTll9jYT91ka1X5/I5V7TQw79rjaQCO8hTNvwGqs+h0wopEOe5LHKDMceTb qJ6MRAXte7wa57dvQ/tyOkbeWQugR6+2Lq1FjDb3YQrB4rRFi9C6LqnmBxc0Wz5HgR9l 6I7A== 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=H2scwZEssf4kDEsnRwZq/AbY5fk4ixKF47JMY7rSlEQ=; b=Yt1/+piCijyet+rNDBVWjZOXP24HruAAdLbsluEpoDU+be6btfi+++D02VErYMN07F czd2MFLqsQ0lHS2Qx3zla694MnJg5y3eKwr93XmGEgiSDCAR6dSOrZdcnHma4F7Uscec cgwsllv748q8boO0OWgz/oLCClipU7dSTnav6MdKuUYbSH1/KC0DV8JEBK2tFpCRoGKl hZeJlrF9ocKnX6r9VMF1Jet2feteQ4y2fDgTscpgg2BlicC2gmSL5VN/TTrMS2IcqpMR 1QXoorujgBrtVhwmkPr2SlcbKNHZHT/vWkcHeuPlBkdqPYyf8KqmoNclCQn3OULXDMh2 DP+w== X-Gm-Message-State: AOAM531CzRRH6fIdTN7aSq1/eCC7oVyFsKB6GjltMYO64b92pNs90Rew H4pMX+W22dXwsgxVoxd4UR4= X-Google-Smtp-Source: ABdhPJyDDNL7ByIuDzNKiseRxpD8CT2H5Qt4meWcgxmNnwoJxaGuBmbyiN8+HOdDk1juM6R+lvI4Rw== X-Received: by 2002:a05:6402:3287:b0:41d:924e:5072 with SMTP id f7-20020a056402328700b0041d924e5072mr29525eda.43.1649710176091; Mon, 11 Apr 2022 13:49:36 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id o5-20020a170906974500b006dfc781498dsm12424639ejy.37.2022.04.11.13.49.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 13:49:35 -0700 (PDT) Date: Mon, 11 Apr 2022 22:49:33 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/7] staging: vt6655: Replace VNSvInPortD with ioread32 Message-ID: <9af181854cd385897db8f4f25e2f011e79d73406.1649706687.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 VNSvInPortD with ioread32. 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 5/7 and is now 4/6 V2 -> V3: Inserted patch that was before in a different way in "Rename macros VNSvInPortB,W,D with CamelCase ..." This patch was part of 4/6 and is now 3/7 --- drivers/staging/vt6655/card.c | 4 ++-- drivers/staging/vt6655/mac.h | 22 +++++++++++----------- drivers/staging/vt6655/rf.c | 2 +- drivers/staging/vt6655/upc.h | 3 --- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 1ccf08b1fd5c..f6d2a7fadc18 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -754,8 +754,8 @@ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *= pqwCurrTSF) } if (ww =3D=3D W_MAX_TIMEOUT) return false; - VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF); - VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1); + *((u32 *)pqwCurrTSF) =3D ioread32(iobase + MAC_REG_TSFCNTR); + *((u32 *)pqwCurrTSF + 1) =3D ioread32(iobase + MAC_REG_TSFCNTR + 4); =20 return true; } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 4e7875ff9ff3..114d1f9c2a1a 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -619,7 +619,7 @@ do { \ #define MACvReceive0(iobase) \ do { \ unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_RXDMACTL0, &dwData); \ + dwData =3D ioread32(iobase + MAC_REG_RXDMACTL0); \ if (dwData & DMACTL_RUN) \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \ else \ @@ -629,7 +629,7 @@ do { \ #define MACvReceive1(iobase) \ do { \ unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_RXDMACTL1, &dwData); \ + dwData =3D ioread32(iobase + MAC_REG_RXDMACTL1); \ if (dwData & DMACTL_RUN) \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \ else \ @@ -639,7 +639,7 @@ do { \ #define MACvTransmit0(iobase) \ do { \ unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_TXDMACTL0, &dwData); \ + dwData =3D ioread32(iobase + MAC_REG_TXDMACTL0); \ if (dwData & DMACTL_RUN) \ VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \ else \ @@ -649,7 +649,7 @@ do { \ #define MACvTransmitAC0(iobase) \ do { \ unsigned long dwData; \ - VNSvInPortD(iobase + MAC_REG_AC0DMACTL, &dwData); \ + dwData =3D ioread32(iobase + MAC_REG_AC0DMACTL); \ if (dwData & DMACTL_RUN) \ VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \ else \ @@ -668,7 +668,7 @@ do { \ } while (0) =20 #define MACvReadISR(iobase, pdwValue) \ - VNSvInPortD(iobase + MAC_REG_ISR, pdwValue) + *(pdwValue) =3D ioread32(iobase + MAC_REG_ISR) =20 #define MACvWriteISR(iobase, dwValue) \ VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) @@ -686,12 +686,12 @@ do { \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1) =20 #define MACvReadMIBCounter(iobase, pdwCounter) \ - VNSvInPortD(iobase + MAC_REG_MIBCNTR, pdwCounter) + *(pdwCounter) =3D ioread32(iobase + MAC_REG_MIBCNTR) =20 #define MACvEnableProtectMD(iobase) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue | ENCFG_PROTECTMD; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) @@ -699,7 +699,7 @@ do { \ #define MACvDisableProtectMD(iobase) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue & ~ENCFG_PROTECTMD; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) @@ -707,7 +707,7 @@ do { \ #define MACvEnableBarkerPreambleMd(iobase) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue | ENCFG_BARKERPREAM; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) @@ -715,7 +715,7 @@ do { \ #define MACvDisableBarkerPreambleMd(iobase) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue & ~ENCFG_BARKERPREAM; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ } while (0) @@ -723,7 +723,7 @@ do { \ #define MACvSetBBType(iobase, byTyp) \ do { \ unsigned long dwOrgValue; \ - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ + dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue & ~ENCFG_BBTYPE_MASK; \ dwOrgValue =3D dwOrgValue | (unsigned long)byTyp; \ VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 4498c9d400f2..036f48572334 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -175,7 +175,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsig= ned long dwData) =20 /* W_MAX_TIMEOUT is the timeout period */ for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { - VNSvInPortD(iobase + MAC_REG_IFREGCTL, &dwValue); + dwValue =3D ioread32(iobase + MAC_REG_IFREGCTL); if (dwValue & IFREGCTL_DONE) break; } diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 99bf7aeb56f7..9617667f1a69 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,9 +20,6 @@ =20 /* For memory mapped IO */ =20 -#define VNSvInPortD(dwIOAddress, pdwData) \ - (*(pdwData) =3D ioread32(dwIOAddress)) - #define VNSvOutPortB(dwIOAddress, byData) \ iowrite8((u8)(byData), dwIOAddress) =20 --=20 2.25.1 From nobody Mon May 11 07:45:47 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 8FA81C433F5 for ; Mon, 11 Apr 2022 20:49:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349970AbiDKUwD (ORCPT ); Mon, 11 Apr 2022 16:52:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349960AbiDKUv6 (ORCPT ); Mon, 11 Apr 2022 16:51:58 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E38E313DE6 for ; Mon, 11 Apr 2022 13:49:42 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id b24so19950352edu.10 for ; Mon, 11 Apr 2022 13:49:42 -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=cRYEcs3fW7Hqu+tQ57lziHYgZW2DW5fdnO18X1QNnyE=; b=gcWt3cP2FTKL72gkCRmx0j+gKjk+FXXCvaAiwXKxxaBVVVriFZ8M/cWjby/NqilZ+N oI1u5T5N3PsADbXoZU/NzIrUffK8771lN/hEh54ZdHT9SVxdz2vDw3pPteP3oZ5Icsy8 j4FcxbdnpU6Z1op0oXHV67Lbcme09UgA/8brP1ac9oWuhb4vXrungEbZ1sxNW9dzvRQV HilFlDuVDxUdE713GoFaeHZKsuMCeVt7Jvu5aTZlIk8tWKI/RgyAVQy4/PdP/lmMGHIC EmXF3jkvEAOD2HIPzbuvLVO/3BpXL2DGfBJMRi8GyHF/cbz78FeIrZoFgPk16G4JWqt4 EBqg== 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=cRYEcs3fW7Hqu+tQ57lziHYgZW2DW5fdnO18X1QNnyE=; b=pCDeIU/KwDXqTjBfF0R4hy0Oh66DBHaz/lJJjiGxwKt1dvE8Fi1gizEZzjFp1tP0nM M29BaY5lNe48xq9XUI13M9HSor/J78zUYXvgSE8P2G93Ct8ytqkHREnUYkFwmdT2+Ef8 BSQw2IOnjAga4eE1yTwgILkDRvtQG+qOJkYXyOk2DY+oKhC5ssnj/1oijZBcd7MgUjLt XXkc+SnkPpCTVmpjE4TEalEeWxaCuKC/lNVoSgTSNlE9NMLDW2zNqMyNo7A5cX8C6oY2 bus5BAk8A23QLOCXwN/bE956McnkLcwh4EIuhanbeup36xx9iUHt1YMjZjxb8lgp1bFE F6dQ== X-Gm-Message-State: AOAM532xMPctQvS4ZvinVDP+whSpLcETTE75rswWBjKy0oJFwTUWuB5X ot6D3aVa89/TqbQ6s0NXoOU= X-Google-Smtp-Source: ABdhPJw+YB6daRudQ/VozEa/hVEiEa+aXevolaJsOhl0hGsqNXs3abHnYtXC01vRJFgsdrx9yuHa1w== X-Received: by 2002:aa7:db0f:0:b0:41d:7b44:2613 with SMTP id t15-20020aa7db0f000000b0041d7b442613mr6872263eds.126.1649710181299; Mon, 11 Apr 2022 13:49:41 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id j8-20020aa7c0c8000000b0041934547989sm15764510edp.55.2022.04.11.13.49.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 13:49:40 -0700 (PDT) Date: Mon, 11 Apr 2022 22:49:39 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/7] staging: vt6655: Replace VNSvOutPortB with iowrite8 Message-ID: <3cac1ca7000a56e82b390ea0ddbab5aa549ee7ec.1649706687.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 VNSvOutPortB with iowrite8. The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl For constants from 0 to below 0x80 the u8 cast was omitted. For variables which are defined as unsigned char the u8 is omitted. 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 6/7 and is now 5/6 V2 -> V3: Changed from "Rename macros VNSvOutPortB,W,D" to Replace VNSvOutPortB with iowrite8 This patch was part of 5/6 and is now 4/7 --- drivers/staging/vt6655/baseband.c | 8 +++--- drivers/staging/vt6655/card.c | 11 ++++---- drivers/staging/vt6655/channel.c | 6 ++-- drivers/staging/vt6655/device_main.c | 19 ++++++------- drivers/staging/vt6655/mac.h | 41 ++++++++++++---------------- drivers/staging/vt6655/rf.c | 8 +++--- drivers/staging/vt6655/rxtx.c | 4 +-- drivers/staging/vt6655/srom.c | 10 +++---- drivers/staging/vt6655/upc.h | 3 -- 9 files changed, 47 insertions(+), 63 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/bas= eband.c index decb55e96f02..4f1c44127e03 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1910,7 +1910,7 @@ bool bb_read_embedded(struct vnt_private *priv, unsig= ned char by_bb_addr, unsigned char by_value; =20 /* BB reg offset */ - VNSvOutPortB(iobase + MAC_REG_BBREGADR, by_bb_addr); + iowrite8(by_bb_addr, iobase + MAC_REG_BBREGADR); =20 /* turn on REGR */ MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR); @@ -1953,9 +1953,9 @@ bool bb_write_embedded(struct vnt_private *priv, unsi= gned char by_bb_addr, unsigned char by_value; =20 /* BB reg offset */ - VNSvOutPortB(iobase + MAC_REG_BBREGADR, by_bb_addr); + iowrite8(by_bb_addr, iobase + MAC_REG_BBREGADR); /* set BB data */ - VNSvOutPortB(iobase + MAC_REG_BBREGDATA, by_data); + iowrite8(by_data, iobase + MAC_REG_BBREGDATA); =20 /* turn on BBREGCTL_REGW */ MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW); @@ -2054,7 +2054,7 @@ bool bb_vt3253_init(struct vnt_private *priv) byVT3253B0_AGC[ii][0], byVT3253B0_AGC[ii][1]); =20 - VNSvOutPortB(iobase + MAC_REG_ITRTMSET, 0x23); + iowrite8(0x23, iobase + MAC_REG_ITRTMSET); MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0)); =20 priv->abyBBVGA[0] =3D 0x14; diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index f6d2a7fadc18..62fda818022e 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -239,26 +239,25 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u= 8 bb_type) =20 if (priv->bySIFS !=3D bySIFS) { priv->bySIFS =3D bySIFS; - VNSvOutPortB(priv->port_offset + MAC_REG_SIFS, priv->bySIFS); + iowrite8(priv->bySIFS, priv->port_offset + MAC_REG_SIFS); } if (priv->byDIFS !=3D byDIFS) { priv->byDIFS =3D byDIFS; - VNSvOutPortB(priv->port_offset + MAC_REG_DIFS, priv->byDIFS); + iowrite8(priv->byDIFS, priv->port_offset + MAC_REG_DIFS); } if (priv->byEIFS !=3D C_EIFS) { priv->byEIFS =3D C_EIFS; - VNSvOutPortB(priv->port_offset + MAC_REG_EIFS, priv->byEIFS); + iowrite8(priv->byEIFS, priv->port_offset + MAC_REG_EIFS); } if (priv->bySlot !=3D bySlot) { priv->bySlot =3D bySlot; - VNSvOutPortB(priv->port_offset + MAC_REG_SLOT, priv->bySlot); + iowrite8(priv->bySlot, priv->port_offset + MAC_REG_SLOT); =20 bb_set_short_slot_time(priv); } if (priv->byCWMaxMin !=3D byCWMaxMin) { priv->byCWMaxMin =3D byCWMaxMin; - VNSvOutPortB(priv->port_offset + MAC_REG_CWMAXMIN0, - priv->byCWMaxMin); + iowrite8(priv->byCWMaxMin, priv->port_offset + MAC_REG_CWMAXMIN0); } =20 priv->byPacketType =3D CARDbyGetPktType(priv); diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/chan= nel.c index abe867814dc8..652dcaf61169 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -118,11 +118,9 @@ bool set_channel(struct vnt_private *priv, struct ieee= 80211_channel *ch) /* set HW default power register */ MACvSelectPage1(priv->port_offset); RFbSetPower(priv, RATE_1M, priv->byCurrentCh); - VNSvOutPortB(priv->port_offset + MAC_REG_PWRCCK, - priv->byCurPwr); + iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK); RFbSetPower(priv, RATE_6M, priv->byCurrentCh); - VNSvOutPortB(priv->port_offset + MAC_REG_PWROFDM, - priv->byCurPwr); + iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWROFDM); MACvSelectPage0(priv->port_offset); =20 spin_unlock_irqrestore(&priv->lock, flags); diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 16b031c31925..1bfccaa08c45 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -334,8 +334,7 @@ static void device_init_registers(struct vnt_private *p= riv) if (priv->local_id > REV_ID_VT3253_B1) { MACvSelectPage1(priv->port_offset); =20 - VNSvOutPortB(priv->port_offset + MAC_REG_MSRCTL + 1, - (MSRCTL1_TXPWR | MSRCTL1_CSAPAREN)); + iowrite8(MSRCTL1_TXPWR | MSRCTL1_CSAPAREN, priv->port_offset + MAC_REG_M= SRCTL + 1); =20 MACvSelectPage0(priv->port_offset); } @@ -349,9 +348,9 @@ static void device_init_registers(struct vnt_private *p= riv) MACvSetLongRetryLimit(priv, priv->byLongRetryLimit); =20 /* reset TSF counter */ - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + iowrite8(TFTCTL_TSFCNTRST, priv->port_offset + MAC_REG_TFTCTL); /* enable TSF counter */ - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + iowrite8(TFTCTL_TSFCNTREN, priv->port_offset + MAC_REG_TFTCTL); =20 /* initialize BBP registers */ bb_vt3253_init(priv); @@ -1060,7 +1059,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) =20 if (isr & ISR_FETALERR) { pr_debug(" ISR_FETALERR\n"); - VNSvOutPortB(priv->port_offset + MAC_REG_SOFTPWRCTL, 0); + iowrite8(0, priv->port_offset + MAC_REG_SOFTPWRCTL); VNSvOutPortW(priv->port_offset + MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); device_error(priv, isr); @@ -1477,10 +1476,8 @@ static void vnt_bss_info_changed(struct ieee80211_hw= *hw, =20 CARDvSetFirstNextTBTT(priv, conf->beacon_int); } else { - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, - TFTCTL_TSFCNTRST); - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, - TFTCTL_TSFCNTREN); + iowrite8(TFTCTL_TSFCNTRST, priv->port_offset + MAC_REG_TFTCTL); + iowrite8(TFTCTL_TSFCNTREN, priv->port_offset + MAC_REG_TFTCTL); } } } @@ -1561,7 +1558,7 @@ static void vnt_configure(struct ieee80211_hw *hw, rx_mode |=3D RCR_BSSID; } =20 - VNSvOutPortB(priv->port_offset + MAC_REG_RCR, rx_mode); + iowrite8(rx_mode, priv->port_offset + MAC_REG_RCR); =20 dev_dbg(&priv->pcid->dev, "rx mode out=3D %x\n", rx_mode); } @@ -1621,7 +1618,7 @@ static void vnt_reset_tsf(struct ieee80211_hw *hw, st= ruct ieee80211_vif *vif) struct vnt_private *priv =3D hw->priv; =20 /* reset TSF counter */ - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + iowrite8(TFTCTL_TSFCNTRST, priv->port_offset + MAC_REG_TFTCTL); } =20 static const struct ieee80211_ops vnt_mac_ops =3D { diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 114d1f9c2a1a..1017236e3117 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -542,7 +542,7 @@ do { \ unsigned char byData; \ byData =3D ioread8(iobase + byRegOfs); \ - VNSvOutPortB(iobase + byRegOfs, byData | (byBits)); \ + iowrite8((u8)(byData | (byBits)), iobase + byRegOfs); \ } while (0) =20 #define MACvWordRegBitsOn(iobase, byRegOfs, wBits) \ @@ -556,7 +556,7 @@ do { \ do { \ unsigned char byData; \ byData =3D ioread8(iobase + byRegOfs); \ - VNSvOutPortB(iobase + byRegOfs, byData & ~(byBits)); \ + iowrite8((u8)(byData & ~(byBits)), iobase + byRegOfs); \ } while (0) =20 #define MACvWordRegBitsOff(iobase, byRegOfs, wBits) \ @@ -578,37 +578,30 @@ do { \ =20 #define MACvWriteBSSIDAddress(iobase, pbyEtherAddr) \ do { \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0, \ - *(pbyEtherAddr)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 1, \ - *(pbyEtherAddr + 1)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 2, \ - *(pbyEtherAddr + 2)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 3, \ - *(pbyEtherAddr + 3)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 4, \ - *(pbyEtherAddr + 4)); \ - VNSvOutPortB(iobase + MAC_REG_BSSID0 + 5, \ - *(pbyEtherAddr + 5)); \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ + iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ + iowrite8((u8)*(pbyEtherAddr), iobase + MAC_REG_BSSID0); \ + iowrite8((u8)*(pbyEtherAddr + 1), iobase + MAC_REG_BSSID0 + 1); \ + iowrite8((u8)*(pbyEtherAddr + 2), iobase + MAC_REG_BSSID0 + 2); \ + iowrite8((u8)*(pbyEtherAddr + 3), iobase + MAC_REG_BSSID0 + 3); \ + iowrite8((u8)*(pbyEtherAddr + 4), iobase + MAC_REG_BSSID0 + 4); \ + iowrite8((u8)*(pbyEtherAddr + 5), iobase + MAC_REG_BSSID0 + 5); \ + iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ } while (0) =20 #define MACvReadEtherAddress(iobase, pbyEtherAddr) \ do { \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ + iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ (*((unsigned char *)pbyEtherAddr) =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); \ + iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ } while (0) =20 #define MACvStart(iobase) \ - VNSvOutPortB(iobase + MAC_REG_HOSTCR, \ - (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON)) + iowrite8(HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON, iobase + MAC_REG_HOSTC= R) =20 #define MACvRx0PerPktMode(iobase) \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) @@ -657,14 +650,14 @@ do { \ } while (0) =20 #define MACvTransmitBCN(iobase) \ - VNSvOutPortB(iobase + MAC_REG_BCNDMACTL, BEACON_READY) + iowrite8(BEACON_READY, iobase + MAC_REG_BCNDMACTL) =20 #define MACvClearStckDS(iobase) \ do { \ unsigned char byOrgValue; \ byOrgValue =3D ioread8(iobase + MAC_REG_STICKHW); \ byOrgValue =3D byOrgValue & 0xFC; \ - VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue); \ + iowrite8((u8)byOrgValue, iobase + MAC_REG_STICKHW); \ } while (0) =20 #define MACvReadISR(iobase, pdwValue) \ @@ -680,10 +673,10 @@ do { \ VNSvOutPortD(iobase + MAC_REG_IMR, 0) =20 #define MACvSelectPage0(iobase) \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0) + iowrite8(0, iobase + MAC_REG_PAGE1SEL) =20 #define MACvSelectPage1(iobase) \ - VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1) + iowrite8(1, iobase + MAC_REG_PAGE1SEL) =20 #define MACvReadMIBCounter(iobase, pdwCounter) \ *(pdwCounter) =3D ioread32(iobase + MAC_REG_MIBCNTR) diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 036f48572334..d4db0a0b702c 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -207,7 +207,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) ret =3D true; =20 /* 3-wire control for normal mode */ - VNSvOutPortB(iobase + MAC_REG_SOFTPWRCTL, 0); + iowrite8(0, iobase + MAC_REG_SOFTPWRCTL); =20 MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI | SOFTPWRCTL_TXPEINV)); @@ -238,7 +238,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) SOFTPWRCTL_TXPEINV)); =20 /* 3-wire control for power saving mode */ - VNSvOutPortB(iobase + MAC_REG_PSPWRSIG, (PSSIG_WPE3 | PSSIG_WPE2)); /* 11= 00 0000 */ + iowrite8((u8)(PSSIG_WPE3 | PSSIG_WPE2), iobase + MAC_REG_PSPWRSIG); /* 11= 00 0000 */ =20 return ret; } @@ -254,10 +254,10 @@ static bool RFbAL2230SelectChannel(struct vnt_private= *priv, unsigned char byCha ret &=3D IFRFbWriteEmbedded(priv, al2230_channel_table1[byChannel - 1]); =20 /* Set Channel[7] =3D 0 to tell H/W channel is changing now. */ - VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel & 0x7F)); + iowrite8((u8)(byChannel & 0x7F), iobase + MAC_REG_CHANNEL); MACvTimer0MicroSDelay(priv, SWITCH_CHANNEL_DELAY_AL2230); /* Set Channel[7] =3D 1 to tell H/W channel change is done. */ - VNSvOutPortB(iobase + MAC_REG_CHANNEL, (byChannel | 0x80)); + iowrite8((u8)(byChannel | 0x80), iobase + MAC_REG_CHANNEL); =20 return ret; } diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 53506e242a96..146ad261696d 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1450,9 +1450,9 @@ int vnt_beacon_make(struct vnt_private *priv, struct = ieee80211_vif *vif) int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif, struct ieee80211_bss_conf *conf) { - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST); + iowrite8(TFTCTL_TSFCNTRST, priv->port_offset + MAC_REG_TFTCTL); =20 - VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + iowrite8(TFTCTL_TSFCNTREN, priv->port_offset + MAC_REG_TFTCTL); =20 CARDvSetFirstNextTBTT(priv, conf->beacon_int); =20 diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index a0432bacb6a0..7feaa5138de0 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -68,13 +68,13 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, byData =3D 0xFF; byOrg =3D ioread8(iobase + MAC_REG_I2MCFG); /* turn off hardware retry for getting NACK */ - VNSvOutPortB(iobase + MAC_REG_I2MCFG, (byOrg & (~I2MCFG_NORETRY))); + iowrite8((u8)(byOrg & (~I2MCFG_NORETRY)), iobase + MAC_REG_I2MCFG); for (wNoACK =3D 0; wNoACK < W_MAX_I2CRETRY; wNoACK++) { - VNSvOutPortB(iobase + MAC_REG_I2MTGID, EEP_I2C_DEV_ID); - VNSvOutPortB(iobase + MAC_REG_I2MTGAD, byContntOffset); + iowrite8(EEP_I2C_DEV_ID, iobase + MAC_REG_I2MTGID); + iowrite8(byContntOffset, iobase + MAC_REG_I2MTGAD); =20 /* issue read command */ - VNSvOutPortB(iobase + MAC_REG_I2MCSR, I2MCSR_EEMR); + iowrite8(I2MCSR_EEMR, iobase + MAC_REG_I2MCSR); /* wait DONE be set */ for (wDelay =3D 0; wDelay < W_MAX_TIMEOUT; wDelay++) { byWait =3D ioread8(iobase + MAC_REG_I2MCSR); @@ -88,7 +88,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, } } byData =3D ioread8(iobase + MAC_REG_I2MDIPT); - VNSvOutPortB(iobase + MAC_REG_I2MCFG, byOrg); + iowrite8(byOrg, iobase + MAC_REG_I2MCFG); return byData; } =20 diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 9617667f1a69..2a6d9cd1b42d 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,9 +20,6 @@ =20 /* For memory mapped IO */ =20 -#define VNSvOutPortB(dwIOAddress, byData) \ - iowrite8((u8)(byData), dwIOAddress) - #define VNSvOutPortW(dwIOAddress, wData) \ iowrite16((u16)(wData), dwIOAddress) =20 --=20 2.25.1 From nobody Mon May 11 07:45:47 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 5D2D1C433F5 for ; Mon, 11 Apr 2022 20:49:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349981AbiDKUwH (ORCPT ); Mon, 11 Apr 2022 16:52:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349974AbiDKUwE (ORCPT ); Mon, 11 Apr 2022 16:52:04 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2D601A070 for ; Mon, 11 Apr 2022 13:49:48 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id c64so7822693edf.11 for ; Mon, 11 Apr 2022 13:49:48 -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=f8xCiZNmfAI5OEPxmdyklB/iaX4jfTxr8jmyXnOj6xs=; b=Qxc7VPeC+bs6eieMJp/A+InfP5E658cOVT1XGhpqizgnsp+PTsZYGeGTxMj5oOl7Li Re3UF20krZuF/ZkRoJRtbOUS4a+PmZT0jD4oKnsMF1n4N2Xcg2PqYh54Lv7mHcuMiiAH FkWpoCtwUiLChheGt8Gj0VnhWj1vhr2woAy5Nu/XbyiGxNQ/lKArEJjJM4A+T9hYhPbX Z+5sDN6WM5PjmzKUH1faeZe63WTsEpSfbyhWTZLEmqzuTo0NRRTe+2JzryqDjgkN3Upq gdkumNdbViVua8A+Eu0qChoajSe3ZKcVX3HSAm9Rc8D+8TkVjbNkMp5v8SlupoCHBDog EkNg== 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=f8xCiZNmfAI5OEPxmdyklB/iaX4jfTxr8jmyXnOj6xs=; b=IUhPZnIv4GPl/mNLFaz3jiE491VqeiZDip9BUukCVq8l0F/eBEgSWgM1oacrlCa7rT CVQR0fei1bY+EfaZWkr98I3nI3x+mF13EDiEZMDUfQIY7lMvHH2fXDQ4hEgVu1r31LkO 2hbPk/1eY43mv6fTuqdIaV98fx8lAvt+I+GGJ98mW2dIUrW0MC8nDc+c3onh3kmcQ/QK gKhe8RqtoYY2DuOVkGWT2SEHzWGcK8DyiuEG1ILoWGvBIJoiqOHfcx4NlFfstYb8Ykbj JwKjHUyYr4ss49C1HifRKZ8/fUcBvppoctglhz0xmiUiExnTRfp4QQrMmSjB7m+fiFN6 Evlg== X-Gm-Message-State: AOAM53039hUiZCNJgdvJ+oTALsAzK9zsRaZ8t/8AO2dewzYSjje1QAoh sqR+pIcyca563GBU/AEFiiA= X-Google-Smtp-Source: ABdhPJwBpFvySAuIC5VFZDk2ZlorXY8+NuzkKg518ADJI8t6deRQZ4+7yjRcRNydRt0o6MZ4N8/+pw== X-Received: by 2002:a05:6402:1909:b0:418:d876:3119 with SMTP id e9-20020a056402190900b00418d8763119mr36306196edz.266.1649710187147; Mon, 11 Apr 2022 13:49:47 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id yy18-20020a170906dc1200b006d6e5c75029sm12238609ejb.187.2022.04.11.13.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 13:49:46 -0700 (PDT) Date: Mon, 11 Apr 2022 22:49:45 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/7] staging: vt6655: Replace VNSvOutPortW with iowrite16 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 VNSvOutPortW with iowrite16. The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl For constants from 0 to below 0x8000 the u16 cast was omitted. For variables which are defined as unsigned short the u16 is omitted. Since there are more than one checkpatch issue per line, more steps are rquired to fix. Signed-off-by: Philipp Hortmann --- V1 -> V2: Patch was not existing V2 -> V3: Inserted patch that was before in a different way in "Rename macros VNSvOutPortB,W,D" This patch was part of 5/6 and is now 5/7 --- drivers/staging/vt6655/card.c | 29 ++++++++++------------------ drivers/staging/vt6655/device_main.c | 3 +-- drivers/staging/vt6655/mac.h | 7 +++---- drivers/staging/vt6655/power.c | 4 ++-- drivers/staging/vt6655/rf.c | 2 +- drivers/staging/vt6655/upc.h | 3 --- 6 files changed, 17 insertions(+), 31 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 62fda818022e..57b9ea385690 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -327,7 +327,7 @@ bool CARDbSetBeaconPeriod(struct vnt_private *priv, qwNextTBTT =3D CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); =20 /* set HW beacon interval */ - VNSvOutPortW(priv->port_offset + MAC_REG_BI, wBeaconInterval); + iowrite16(wBeaconInterval, priv->port_offset + MAC_REG_BI); priv->wBeaconInterval =3D wBeaconInterval; /* Set NextTBTT */ VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); @@ -588,68 +588,59 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_t= ype) bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_6, - MAKEWORD(byTxRate, byRsvTime)); + iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPI= NF_A_6); /* RSPINF_a_9 */ s_vCalculateOFDMRParameter(RATE_9M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_9, - MAKEWORD(byTxRate, byRsvTime)); + iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPI= NF_A_9); /* RSPINF_a_12 */ s_vCalculateOFDMRParameter(RATE_12M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_12, - MAKEWORD(byTxRate, byRsvTime)); + iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPI= NF_A_12); /* RSPINF_a_18 */ s_vCalculateOFDMRParameter(RATE_18M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_18, - MAKEWORD(byTxRate, byRsvTime)); + iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPI= NF_A_18); /* RSPINF_a_24 */ s_vCalculateOFDMRParameter(RATE_24M, bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_24, - MAKEWORD(byTxRate, byRsvTime)); + iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPI= NF_A_24); /* RSPINF_a_36 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, RATE_36M), bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_36, - MAKEWORD(byTxRate, byRsvTime)); + iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPI= NF_A_36); /* RSPINF_a_48 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, RATE_48M), bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_48, - MAKEWORD(byTxRate, byRsvTime)); + iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPI= NF_A_48); /* RSPINF_a_54 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, RATE_54M), bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_54, - MAKEWORD(byTxRate, byRsvTime)); + iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPI= NF_A_54); /* RSPINF_a_72 */ s_vCalculateOFDMRParameter(CARDwGetOFDMControlRate((void *)priv, RATE_54M), bb_type, &byTxRate, &byRsvTime); - VNSvOutPortW(priv->port_offset + MAC_REG_RSPINF_A_72, - MAKEWORD(byTxRate, byRsvTime)); + iowrite16(MAKEWORD(byTxRate, byRsvTime), priv->port_offset + MAC_REG_RSPI= NF_A_72); /* Set to Page0 */ MACvSelectPage0(priv->port_offset); =20 diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 1bfccaa08c45..bd97e3b9bc98 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1060,8 +1060,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) if (isr & ISR_FETALERR) { pr_debug(" ISR_FETALERR\n"); iowrite8(0, priv->port_offset + MAC_REG_SOFTPWRCTL); - VNSvOutPortW(priv->port_offset + - MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI); + iowrite16(SOFTPWRCTL_SWPECTI, priv->port_offset + MAC_REG_SOFTPWRCTL); device_error(priv, isr); } =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 1017236e3117..9e8f7e1f1655 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -549,7 +549,7 @@ do { \ do { \ unsigned short wData; \ wData =3D ioread16(iobase + byRegOfs); \ - VNSvOutPortW(iobase + byRegOfs, wData | (wBits)); \ + iowrite16((u16)(wData | (wBits)), iobase + byRegOfs); \ } while (0) =20 #define MACvRegBitsOff(iobase, byRegOfs, byBits) \ @@ -563,7 +563,7 @@ do { \ do { \ unsigned short wData; \ wData =3D ioread16(iobase + byRegOfs); \ - VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \ + iowrite16((u16)(wData & ~(wBits)), iobase + byRegOfs); \ } while (0) =20 /* set the chip with current BCN tx descriptor address */ @@ -573,8 +573,7 @@ do { \ =20 /* set the chip with current BCN length */ #define MACvSetCurrBCNLength(iobase, wCurrBCNLength) \ - VNSvOutPortW(iobase + MAC_REG_BCNDMACTL + 2, \ - wCurrBCNLength) + iowrite16((u16)(wCurrBCNLength), iobase + MAC_REG_BCNDMACTL + 2) =20 #define MACvWriteBSSIDAddress(iobase, pbyEtherAddr) \ do { \ diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index 06066fa56dd5..0bd2ddc61648 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -52,10 +52,10 @@ void PSvEnablePowerSaving(struct vnt_private *priv, u16 wAID =3D priv->current_aid | BIT(14) | BIT(15); =20 /* set period of power up before TBTT */ - VNSvOutPortW(priv->port_offset + MAC_REG_PWBT, C_PWBT); + iowrite16(C_PWBT, priv->port_offset + MAC_REG_PWBT); if (priv->op_mode !=3D NL80211_IFTYPE_ADHOC) { /* set AID */ - VNSvOutPortW(priv->port_offset + MAC_REG_AIDATIM, wAID); + iowrite16(wAID, priv->port_offset + MAC_REG_AIDATIM); } =20 /* Set AutoSleep */ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index d4db0a0b702c..76c651d4da31 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -350,7 +350,7 @@ bool rf_write_wake_prog_syn(struct vnt_private *priv, u= nsigned char rf_type, unsigned char sleep_count =3D 0; unsigned short idx =3D MISCFIFO_SYNDATA_IDX; =20 - VNSvOutPortW(iobase + MAC_REG_MISCFFNDEX, 0); + iowrite16(0, iobase + MAC_REG_MISCFFNDEX); switch (rf_type) { case RF_AIROHA: case RF_AL2230S: diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 2a6d9cd1b42d..c14b4d98c466 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,9 +20,6 @@ =20 /* For memory mapped IO */ =20 -#define VNSvOutPortW(dwIOAddress, wData) \ - iowrite16((u16)(wData), dwIOAddress) - #define VNSvOutPortD(dwIOAddress, dwData) \ iowrite32((u32)(dwData), dwIOAddress) =20 --=20 2.25.1 From nobody Mon May 11 07:45:47 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 2B269C433EF for ; Mon, 11 Apr 2022 20:50:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349977AbiDKUwR (ORCPT ); Mon, 11 Apr 2022 16:52:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349990AbiDKUwM (ORCPT ); Mon, 11 Apr 2022 16:52:12 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 758D41EEE6 for ; Mon, 11 Apr 2022 13:49:53 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id bg10so33361721ejb.4 for ; Mon, 11 Apr 2022 13:49:53 -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=5RRsAeFHsJE/GG1PmX2Yi6Rfzr2T/OETCmslgZ6usKo=; b=hdT5Q4f4J3Q7ETL65mCZlahW1T/iCapOTW8OEGSX77f8wiortJYgzrCoaVSmhjmzut rrFzLAZk2jxvaQosxuRG5kWQ0OrraT/6c4kBFzEg+M/is00nmXcSNsBJRUaod4/H6IxC dZdps1UPAxmDI60/KFnPeELyjC6MweqMV/U+FwP6Tcb56TcyK+CTlnY39cLlrK3Rmely NTujmBhvD5ymlJ32RAOjl4ogF8YxW6zJJsRmSzs0ujWmUdAZ/Y3UkYKjQ2Pj4xy0uWCR LW1hQvoleqAhUIRLOAQmgwpRmMMwDrcwp4GrjoELAY+2CYhoNHkiWwXsI7ZTVW/diQZH aKCA== 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=5RRsAeFHsJE/GG1PmX2Yi6Rfzr2T/OETCmslgZ6usKo=; b=X2ZgBbyMqcptS3gR5GRipLSZ4UXZCBCVtpWSN8t/aRP0X1bw6nXN7Ez6X49O/fP46B AVmFKQbW50fSr7xkjl9eNxWGSVPT9/Vs3O9A2I1qS+mJzaEMllI66ZJH3VTFfcGuDIRN JE0ErS9joMLg/EO2VF3M3vODjOuLPzmCLIpUgrHSlo/ZTVD1kedOVC6s06V5w4fcybOq BKr/YuGpZYCOgan1KemyVGWFISyGgluALm+l29ZNrUDIMY51z8ciMDOm8U/0qrMhk9Vu ikxGrPpGd5/IeJuEGrJR8JqdaxNJv+3PNNF4HCeXisAUXylauPIlY9rTSjIwckqULWdu FtVw== X-Gm-Message-State: AOAM533Y9pTSYqILtwpIT0a4Fr6dyVaZnd1knLz0EHt0fxbME25nGnIp 8cpfHr23CZTZSsMsIrcJQxs= X-Google-Smtp-Source: ABdhPJzjy0x3c/tX1VotMsvfHQG9+DXzsn5v/WGTuH0nqXXRNAuR5G/dTLQ/N5B0Ss2FsBHE6U4jew== X-Received: by 2002:a17:907:7b8a:b0:6e7:7c12:b06d with SMTP id ne10-20020a1709077b8a00b006e77c12b06dmr15367018ejc.594.1649710192050; Mon, 11 Apr 2022 13:49:52 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id z21-20020a1709063a1500b006da6436819dsm12313957eje.173.2022.04.11.13.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 13:49:51 -0700 (PDT) Date: Mon, 11 Apr 2022 22:49:49 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/7] staging: vt6655: Replace VNSvOutPortD with iowrite32 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 VNSvOutPortD with iowrite32. The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl For constants from 0 to below 0x80000000 the u32 cast was omitted. For variables which are defined as unsigned long the u32 is omitted. Since there are more than one checkpatch issue per line, more steps are rquired to fix. Signed-off-by: Philipp Hortmann --- V1 -> V2: Patch was not existing V2 -> V3: Inserted patch that was before in a different way in "Rename macros VNSvOutPortB,W,D" This patch was part of 5/6 and is now 6/7 --- drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/card.c | 27 +++++++++---------- drivers/staging/vt6655/device_main.c | 14 ++++------ drivers/staging/vt6655/mac.h | 39 ++++++++++++++-------------- drivers/staging/vt6655/rf.c | 2 +- drivers/staging/vt6655/upc.h | 3 --- 6 files changed, 38 insertions(+), 49 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/bas= eband.c index 4f1c44127e03..3b3211d0077a 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -2014,7 +2014,7 @@ bool bb_vt3253_init(struct vnt_private *priv) byVT3253B0_AGC4_RFMD2959[ii][0], byVT3253B0_AGC4_RFMD2959[ii][1]); =20 - VNSvOutPortD(iobase + MAC_REG_ITRTMSET, 0x23); + iowrite32(0x23, iobase + MAC_REG_ITRTMSET); MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0)); } priv->abyBBVGA[0] =3D 0x18; diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 57b9ea385690..8701a3a6b46f 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -294,10 +294,8 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned= char byRxRate, qwTSFOffset =3D CARDqGetTSFOffset(byRxRate, qwBSSTimestamp, local_tsf); /* adjust TSF, HW's TSF add TSF Offset reg */ - VNSvOutPortD(priv->port_offset + MAC_REG_TSFOFST, - (u32)qwTSFOffset); - VNSvOutPortD(priv->port_offset + MAC_REG_TSFOFST + 4, - (u32)(qwTSFOffset >> 32)); + iowrite32((u32)qwTSFOffset, priv->port_offset + MAC_REG_TSFOFST); + iowrite32((u32)(qwTSFOffset >> 32), priv->port_offset + MAC_REG_TSFOFST = + 4); MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFSYNCEN); } @@ -330,9 +328,8 @@ bool CARDbSetBeaconPeriod(struct vnt_private *priv, iowrite16(wBeaconInterval, priv->port_offset + MAC_REG_BI); priv->wBeaconInterval =3D wBeaconInterval; /* Set NextTBTT */ - VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); - VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT + 4, - (u32)(qwNextTBTT >> 32)); + iowrite32((u32)qwNextTBTT, priv->port_offset + MAC_REG_NEXTTBTT); + iowrite32((u32)(qwNextTBTT >> 32), priv->port_offset + MAC_REG_NEXTTBTT += 4); MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); =20 return true; @@ -554,7 +551,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) /* swap over to get correct write order */ swap(phy.swap[0], phy.swap[1]); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_1, phy.field_write); + iowrite32(phy.field_write, priv->port_offset + MAC_REG_RSPINF_B_1); =20 /* RSPINF_b_2 */ vnt_get_phy_field(priv, 14, @@ -563,7 +560,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) =20 swap(phy.swap[0], phy.swap[1]); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_2, phy.field_write); + iowrite32(phy.field_write, priv->port_offset + MAC_REG_RSPINF_B_2); =20 /* RSPINF_b_5 */ vnt_get_phy_field(priv, 14, @@ -572,7 +569,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) =20 swap(phy.swap[0], phy.swap[1]); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_5, phy.field_write); + iowrite32(phy.field_write, priv->port_offset + MAC_REG_RSPINF_B_5); =20 /* RSPINF_b_11 */ vnt_get_phy_field(priv, 14, @@ -581,7 +578,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_typ= e) =20 swap(phy.swap[0], phy.swap[1]); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_11, phy.field_write); + iowrite32(phy.field_write, priv->port_offset + MAC_REG_RSPINF_B_11); =20 /* RSPINF_a_6 */ s_vCalculateOFDMRParameter(RATE_6M, @@ -800,8 +797,8 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, =20 qwNextTBTT =3D CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); /* Set NextTBTT */ - VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); - VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwNextTBTT >> 32)); + iowrite32((u32)qwNextTBTT, iobase + MAC_REG_NEXTTBTT); + iowrite32((u32)(qwNextTBTT >> 32), iobase + MAC_REG_NEXTTBTT + 4); MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); } =20 @@ -826,8 +823,8 @@ void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 = qwTSF, =20 qwTSF =3D CARDqGetNextTBTT(qwTSF, wBeaconInterval); /* Set NextTBTT */ - VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwTSF); - VNSvOutPortD(iobase + MAC_REG_NEXTTBTT + 4, (u32)(qwTSF >> 32)); + iowrite32((u32)qwTSF, iobase + MAC_REG_NEXTTBTT); + iowrite32((u32)(qwTSF >> 32), iobase + MAC_REG_NEXTTBTT + 4); MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); pr_debug("Card:Update Next TBTT[%8llx]\n", qwTSF); } diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index bd97e3b9bc98..8de225701ca1 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1522,20 +1522,16 @@ static void vnt_configure(struct ieee80211_hw *hw, if (priv->mc_list_count > 2) { MACvSelectPage1(priv->port_offset); =20 - VNSvOutPortD(priv->port_offset + - MAC_REG_MAR0, 0xffffffff); - VNSvOutPortD(priv->port_offset + - MAC_REG_MAR0 + 4, 0xffffffff); + iowrite32((u32)0xffffffff, priv->port_offset + MAC_REG_MAR0); + iowrite32((u32)0xffffffff, priv->port_offset + MAC_REG_MAR0 + 4); =20 MACvSelectPage0(priv->port_offset); } else { MACvSelectPage1(priv->port_offset); =20 - VNSvOutPortD(priv->port_offset + - MAC_REG_MAR0, (u32)multicast); - VNSvOutPortD(priv->port_offset + - MAC_REG_MAR0 + 4, - (u32)(multicast >> 32)); + iowrite32((u32)multicast, priv->port_offset + MAC_REG_MAR0); + iowrite32((u32)(multicast >> 32), + priv->port_offset + MAC_REG_MAR0 + 4); =20 MACvSelectPage0(priv->port_offset); } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 9e8f7e1f1655..4827f370b5ad 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -568,8 +568,7 @@ do { \ =20 /* set the chip with current BCN tx descriptor address */ #define MACvSetCurrBCNTxDescAddr(iobase, dwCurrDescAddr) \ - VNSvOutPortD(iobase + MAC_REG_BCNDMAPTR, \ - dwCurrDescAddr) + iowrite32((u32)(dwCurrDescAddr), iobase + MAC_REG_BCNDMAPTR) =20 /* set the chip with current BCN length */ #define MACvSetCurrBCNLength(iobase, wCurrBCNLength) \ @@ -603,19 +602,19 @@ do { \ iowrite8(HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON, iobase + MAC_REG_HOSTC= R) =20 #define MACvRx0PerPktMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) + iowrite32(RX_PERPKT, iobase + MAC_REG_RXDMACTL0) =20 #define MACvRx1PerPktMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) + iowrite32(RX_PERPKT, iobase + MAC_REG_RXDMACTL1) =20 #define MACvReceive0(iobase) \ do { \ unsigned long dwData; \ dwData =3D ioread32(iobase + MAC_REG_RXDMACTL0); \ if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \ + iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL0); \ else \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_RUN); \ + iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL0); \ } while (0) =20 #define MACvReceive1(iobase) \ @@ -623,9 +622,9 @@ do { \ unsigned long dwData; \ dwData =3D ioread32(iobase + MAC_REG_RXDMACTL1); \ if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \ + iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL1); \ else \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_RUN); \ + iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL1); \ } while (0) =20 #define MACvTransmit0(iobase) \ @@ -633,9 +632,9 @@ do { \ unsigned long dwData; \ dwData =3D ioread32(iobase + MAC_REG_TXDMACTL0); \ if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \ + iowrite32(DMACTL_WAKE, iobase + MAC_REG_TXDMACTL0); \ else \ - VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_RUN); \ + iowrite32(DMACTL_RUN, iobase + MAC_REG_TXDMACTL0); \ } while (0) =20 #define MACvTransmitAC0(iobase) \ @@ -643,9 +642,9 @@ do { \ unsigned long dwData; \ dwData =3D ioread32(iobase + MAC_REG_AC0DMACTL); \ if (dwData & DMACTL_RUN) \ - VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \ + iowrite32(DMACTL_WAKE, iobase + MAC_REG_AC0DMACTL); \ else \ - VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_RUN); \ + iowrite32(DMACTL_RUN, iobase + MAC_REG_AC0DMACTL); \ } while (0) =20 #define MACvTransmitBCN(iobase) \ @@ -663,13 +662,13 @@ do { \ *(pdwValue) =3D ioread32(iobase + MAC_REG_ISR) =20 #define MACvWriteISR(iobase, dwValue) \ - VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) + iowrite32((u32)(dwValue), iobase + MAC_REG_ISR) =20 #define MACvIntEnable(iobase, dwMask) \ - VNSvOutPortD(iobase + MAC_REG_IMR, dwMask) + iowrite32((u32)(dwMask), iobase + MAC_REG_IMR) =20 #define MACvIntDisable(iobase) \ - VNSvOutPortD(iobase + MAC_REG_IMR, 0) + iowrite32(0, iobase + MAC_REG_IMR) =20 #define MACvSelectPage0(iobase) \ iowrite8(0, iobase + MAC_REG_PAGE1SEL) @@ -685,7 +684,7 @@ do { \ unsigned long dwOrgValue; \ dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue | ENCFG_PROTECTMD; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)(dwOrgValue), iobase + MAC_REG_ENCFG); \ } while (0) =20 #define MACvDisableProtectMD(iobase) \ @@ -693,7 +692,7 @@ do { \ unsigned long dwOrgValue; \ dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue & ~ENCFG_PROTECTMD; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)(dwOrgValue), iobase + MAC_REG_ENCFG); \ } while (0) =20 #define MACvEnableBarkerPreambleMd(iobase) \ @@ -701,7 +700,7 @@ do { \ unsigned long dwOrgValue; \ dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue | ENCFG_BARKERPREAM; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)(dwOrgValue), iobase + MAC_REG_ENCFG); \ } while (0) =20 #define MACvDisableBarkerPreambleMd(iobase) \ @@ -709,7 +708,7 @@ do { \ unsigned long dwOrgValue; \ dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue & ~ENCFG_BARKERPREAM; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)(dwOrgValue), iobase + MAC_REG_ENCFG); \ } while (0) =20 #define MACvSetBBType(iobase, byTyp) \ @@ -718,7 +717,7 @@ do { \ dwOrgValue =3D ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue =3D dwOrgValue & ~ENCFG_BBTYPE_MASK; \ dwOrgValue =3D dwOrgValue | (unsigned long)byTyp; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)(dwOrgValue), iobase + MAC_REG_ENCFG); \ } while (0) =20 #define MACvGPIOIn(iobase, pbyValue) \ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 76c651d4da31..fbbf2ce80120 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -171,7 +171,7 @@ bool IFRFbWriteEmbedded(struct vnt_private *priv, unsig= ned long dwData) unsigned short ww; unsigned long dwValue; =20 - VNSvOutPortD(iobase + MAC_REG_IFREGCTL, dwData); + iowrite32(dwData, iobase + MAC_REG_IFREGCTL); =20 /* W_MAX_TIMEOUT is the timeout period */ for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index c14b4d98c466..904a299cccb5 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,9 +20,6 @@ =20 /* For memory mapped IO */ =20 -#define VNSvOutPortD(dwIOAddress, dwData) \ - iowrite32((u32)(dwData), dwIOAddress) - #define PCAvDelayByIO(uDelayUnit) \ do { \ unsigned char __maybe_unused byData; \ --=20 2.25.1 From nobody Mon May 11 07:45:47 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 94864C433EF for ; Mon, 11 Apr 2022 20:50:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349995AbiDKUwU (ORCPT ); Mon, 11 Apr 2022 16:52:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349983AbiDKUwN (ORCPT ); Mon, 11 Apr 2022 16:52:13 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32B801A070 for ; Mon, 11 Apr 2022 13:49:58 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id w18so19940929edi.13 for ; Mon, 11 Apr 2022 13:49:58 -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=5Vx0z+MVKUBmBfjBdTjqM5v4jlT6V2YkgBEKK8N1PQs=; b=Ud3vN7jzkPF7arNd+zJeB7XzWv5Yh+fWuatSJTAPvJrJ1kZcfPH/OJdHjm0vr6Yki7 RmYeXa0Br3cseLRlP5SRMyVpm4TIA5gJRYAfTc8IYU6g4DeNoLz5negaozcsYTcGlOBd 2zsNteewWjUSbc9mkd28dzvkJ0KWId+4DVEp8MuxHCbA+beHS+f2h28vBwAMi85YoZTu BPLVvUHJtzl9MzHkk/Z5DbbEyWHWnCDBSVY/kEITQL334/0JrVIJWPgWVjegGiYZlmNv v47p24W7ihh6IsINhzdatrJcD0uQpgoCDw2csABE2muHxTgUDdzYZhBuc3yqhcaNzP98 Yycg== 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=5Vx0z+MVKUBmBfjBdTjqM5v4jlT6V2YkgBEKK8N1PQs=; b=y9THlk8CKFDlWnxP98KryaXktouGNP2ysoGDdEWLYQRymVIXG3LJs47rpwdeCErOf/ wrbqarWOsFTHnaHo/N3S+LOLlUCRnYnA9e1tTlcXZJ50OPjfjlxfazGMyG6Nisei4Pbl vTvJWnWSG5KOGfC5qxiQKNJSIFlKjKUpE01SBTT6591U8WQzNrrE7sFYBTAKYlqb1u4b 1dX8JY9undQYpwHfnIIBGuvL4LGK/KAMIL0RCfU481ja6j6bDMoyi71iUl0uZTvif6gQ BtzmCPbb1+J1KwLHhLsGVQN1zEJesPkiUyqiNV/FAhc+uzc5ofakVAPfCp97Lb8h2BPA vmWw== X-Gm-Message-State: AOAM531Z51l1E5KvaXiJMM22JUTgCAzcuBJVHWOOhSnOzgbnxDEIzGcS oHTft3ua2pTviVmmWO/pcc7mTAstkLc= X-Google-Smtp-Source: ABdhPJx96w0uzfV3MkFvivgu9/OcTTrpwo34F7tlVg0VK62oKu8X2q29ZoOLvvTVC0kuBcaIE9ujog== X-Received: by 2002:a05:6402:40c4:b0:419:135b:83ac with SMTP id z4-20020a05640240c400b00419135b83acmr35494668edb.321.1649710196805; Mon, 11 Apr 2022 13:49:56 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id j22-20020a50ed16000000b00419366b2146sm16064061eds.43.2022.04.11.13.49.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 13:49:56 -0700 (PDT) Date: Mon, 11 Apr 2022 22:49:54 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 7/7] staging: vt6655: Remove macro PCAvDelayByIO 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" Remove do-while(0) and CamelCase macro PCAvDelayByIO as it is not accepted by checkpatch.pl As the macro is just used once with a constant <=3D 50 the functionality of the macro is implemented by using udelay() directly. Signed-off-by: Philipp Hortmann --- V1 -> V2: Changed converting macro to function to delete macro This patch was 7/7 and is now 6/6 V2 -> V3: No changes This patch was 6/6 and is now 7/7 --- drivers/staging/vt6655/srom.c | 2 +- drivers/staging/vt6655/upc.h | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 7feaa5138de0..e3ee76f09e0c 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -80,7 +80,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase, byWait =3D ioread8(iobase + MAC_REG_I2MCSR); if (byWait & (I2MCSR_DONE | I2MCSR_NACK)) break; - PCAvDelayByIO(CB_DELAY_LOOP_WAIT); + udelay(CB_DELAY_LOOP_WAIT); } if ((wDelay < W_MAX_TIMEOUT) && (!(byWait & I2MCSR_NACK))) { diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 904a299cccb5..c7966a638fde 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,19 +20,6 @@ =20 /* For memory mapped IO */ =20 -#define PCAvDelayByIO(uDelayUnit) \ -do { \ - unsigned char __maybe_unused byData; \ - unsigned long ii; \ - \ - if (uDelayUnit <=3D 50) { \ - udelay(uDelayUnit); \ - } else { \ - for (ii =3D 0; ii < (uDelayUnit); ii++) \ - byData =3D inb(0x61); \ - } \ -} while (0) - /*--------------------- Export Classes ----------------------------*/ =20 /*--------------------- Export Variables --------------------------*/ --=20 2.25.1