From nobody Sun May 10 21:17:39 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 A5BC9C433EF for ; Sun, 24 Apr 2022 07:44:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238548AbiDXHrR (ORCPT ); Sun, 24 Apr 2022 03:47:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238526AbiDXHrJ (ORCPT ); Sun, 24 Apr 2022 03:47:09 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0793F1EC58 for ; Sun, 24 Apr 2022 00:44:10 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id e2so10407257wrh.7 for ; Sun, 24 Apr 2022 00:44:09 -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=fn9CcP5Vh0+wAX3G1q2UYNdRxUFXZma/d6F4xQnG0PY=; b=OtLXn6e3qmo06a2AS4zWNCKvb/VLOI55uCPO2O98y+O2XnloUzd5+55kqaJwql0ncp juv8dm9kGGZUfzTVCgbt/r1r5irth0avs4LIGzJmpaKGyACjgchn4eUDkWbD55pxQwZj YeDGXcU9vVYApe0KHnFzaWxHV0vL0bWLZL0+a2bJGabVxdhSaHnGZ6D1zY/DNkpvcTSA aH4amop+RZlmcDhUx2AxK3kly9DFMCQ2PLySXPVvUqgeO3VuPxf17aQgipxtmhLvQG3A yBUk3Gqmr3ddUx9NAG/c8zsdhiIVUB5B34ddPYlx17MgJVzVTSRfgGeXyz6XVeUCBDhC MuAw== 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=fn9CcP5Vh0+wAX3G1q2UYNdRxUFXZma/d6F4xQnG0PY=; b=h/8F5SXOOOckMaqlvCThq8jcm68TON+UWag+2bylvML8zk7cL29VCKsd15J1Q4zAaL +rS7+wFcm3QL4NVEQA89v4/0vOAopXjD5GNk2XmwHGUo7rcBxWRv1DyGAk/WeTIdqVil rVq9yQDV59lFZMZVghD5UYX7LNc/C2PyXxjaxRdqAfQMFBDygfJ1TR3sU6O7MM6SJhc9 Dg8P0yGqUtdzpeiHPQaS1K/72xY+JgRByaJV+WIxTz8yGbjgRX4RG3PjWnY67KqTqMEz ev/+6eSp6notGDWVpxCI4DOT+cnPqYXjTmU6QriGrP7xXETEC4H86w9rHe9bHMc/E0Mj KmNQ== X-Gm-Message-State: AOAM533bOPKBv4zDYV+/AZhvy+nFadz1GmFrCZZlTkezGs3ZOZrOsi7e plwPelzeKAptYZIugKPB5d4= X-Google-Smtp-Source: ABdhPJz1FirqZYMc88NVRvv69nBdmxomOWK+5FiNQlDznykAa9AlPrkJifoDWUJKiNk6TCST/gBLig== X-Received: by 2002:a05:6000:18a8:b0:20a:8a52:5c7e with SMTP id b8-20020a05600018a800b0020a8a525c7emr10114338wri.355.1650786248643; Sun, 24 Apr 2022 00:44:08 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id w8-20020a1cf608000000b0038c8fdc93d6sm8114288wmc.28.2022.04.24.00.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 00:44:08 -0700 (PDT) Date: Sun, 24 Apr 2022 09:44:05 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] staging: vt6655: Replace VNSvInPortW with ioread16 Message-ID: <2d55e245cc530ffafe53384df03691d1b29b495c.1650784817.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 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 V3 -> V4: added Tab so that \ is inline with above and below lines --- 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 7970a42ee6e6..4c6739862188 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -547,7 +547,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 @@ -561,7 +561,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 d2c1528c8e1b..4d09cf18ebe0 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 Sun May 10 21:17:39 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 E8B78C433EF for ; Sun, 24 Apr 2022 07:44:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238560AbiDXHrV (ORCPT ); Sun, 24 Apr 2022 03:47:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238545AbiDXHrP (ORCPT ); Sun, 24 Apr 2022 03:47:15 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 524CC1EC58 for ; Sun, 24 Apr 2022 00:44:15 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id x18so16726356wrc.0 for ; Sun, 24 Apr 2022 00:44:15 -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=XMF+gMN9bhGYDlM3pFVKQ1yvAcKiJtAzC5AwaU+IPA0=; b=ZDvOWeSp+/f+BDi5HK/bFni4dJxfkbK0SvMwv6Qv1BBbaWjz9cpBB3+1cnJiwvpx7l qVVPXrWkM/gykvnbz7qxAcvCNT5xwNqLyVtGZ17yEBYa66Jry6HeoQ8ocI2YqgGSkoMT anq66aTWr06mE2O7zvptqqGUNntZgHbTxRW2E1K7O8xirFNTijsz8Xe+w1AIRcI1P+8D qzTOOFd/A3TmXpdH1sWnIAe22pj5M9RWEBBkJzMfDKGrTzMoJXCnjPYqp95qtspZ3Qd7 i1a8zenCfN/uotMDBSejcN0N7iiv8CqUz4lTBU4yA4Y1PQNg08PUQ2k1PzXMrCI4qO53 D3Uw== 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=XMF+gMN9bhGYDlM3pFVKQ1yvAcKiJtAzC5AwaU+IPA0=; b=3VpzsNiSCxB5TXOjiBaGpJR5EM8+lwnUviiwUNVxqgE239hFyPf9GIr3wLnZ0+rKUW qTCuIzYDroRqG/buw5GI0QAfhIqosNcjmasXK8vEQqIfnSP8VPgvj2UYB7Bz1SivcOUJ PgMM+UXRvGZqxvXdt6TvOsR33l9rbj4hfth5uTIGpT5stYhVlBlxAY8iA7SHS5ORGgql 0lynz5Sxa+nd7rAQGkMP+JZBGMzgMTSF3Ui483+MIFYKkjdleWRvJu5JgG2qn95Qe2D4 nhUI0FfNDdv8eJIWj++Xvko0tOT7lZAUjJNApZQgEXinh45USlGhVtHIe2YVZgoRVDN0 S1Fg== X-Gm-Message-State: AOAM532gWonJquNGVZOfWphCjZrgjZX5+/ifuvcngr0Br7LdzXiHA0Yy 2qEkg+NE5Cyn2rFzYk97Fpw= X-Google-Smtp-Source: ABdhPJzhxDdUI4l6zvYKUDfy+krONxhiqUq+YF1HSrTGYdkqScYp0jMP9GJQcs/+uc4U3vk5h8PRTA== X-Received: by 2002:a05:6000:1f91:b0:207:b6b1:64a9 with SMTP id bw17-20020a0560001f9100b00207b6b164a9mr9687866wrb.286.1650786253911; Sun, 24 Apr 2022 00:44:13 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id u16-20020a05600c441000b0038ebcbadcedsm10016908wmn.2.2022.04.24.00.44.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 00:44:13 -0700 (PDT) Date: Sun, 24 Apr 2022 09:44:11 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] staging: vt6655: Replace MACvReadMIBCounter with VNSvInPortD Message-ID: <2a50f3e99b15db2100f93e1e1a2b5cbc13b82882.1650784817.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 MACvReadMIBCounter with VNSvInPortD. Last patch within this patch series will replace all macros VNSvInPortD with ioread32. 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 08b955c71b3c..7cceb57a5139 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1042,7 +1042,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) spin_lock_irqsave(&priv->lock, flags); =20 /* Read low level stats */ - MACvReadMIBCounter(priv->port_offset, &mib_counter); + VNSvInPortD(priv->port_offset + MAC_REG_MIBCNTR, &mib_counter); =20 low_stats->dot11RTSSuccessCount +=3D mib_counter & 0xff; low_stats->dot11RTSFailureCount +=3D (mib_counter >> 8) & 0xff; diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 4c6739862188..74b45e1f0963 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -684,9 +684,6 @@ do { \ #define MACvSelectPage1(iobase) \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1) =20 -#define MACvReadMIBCounter(iobase, pdwCounter) \ - VNSvInPortD(iobase + MAC_REG_MIBCNTR, pdwCounter) - #define MACvEnableProtectMD(iobase) \ do { \ unsigned long dwOrgValue; \ --=20 2.25.1 From nobody Sun May 10 21:17:39 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 2416FC433F5 for ; Sun, 24 Apr 2022 07:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238562AbiDXHr1 (ORCPT ); Sun, 24 Apr 2022 03:47:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238559AbiDXHrV (ORCPT ); Sun, 24 Apr 2022 03:47:21 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A5661FA4B for ; Sun, 24 Apr 2022 00:44:21 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id b19so16647126wrh.11 for ; Sun, 24 Apr 2022 00:44:21 -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=fgBUlpHj30ipZDs3qRp+zmtHfcJ9iQ4ROlt9IZ+zLbQ=; b=SQGD+ZnRqFlyZ3xkIBi0A13arggBjEqcJZybJI+jfnlOtPd4mPV9x1ixhIK1Xujs+x z3NyWkCTehYUW7i4AFXuOe0cKNujen8oPXftS101OLn5qTYXP3Y2xDicYZozrCcA9xEl CDwmjBwXUsoOMLnejwXJbUM+JRw9+SSmox25+wCEmLpKY5MnsTTYjQ9GFoLEwmFLEqZy PqUSajtaD1As9IHUMwSBxyAvaOVbPftf4B5b/Agwv0yYMaoNJydDFjuciwaGPTVowWGo X1y0+6mhtoKLRX8bwa1pIwMRPtBuhmnXk3xt3WxXe0Bg+fVVOPe1Ao+0wv5Lbeb2dvpE sunQ== 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=fgBUlpHj30ipZDs3qRp+zmtHfcJ9iQ4ROlt9IZ+zLbQ=; b=E3EfcTHp7uwSCjInojZITH2U4BK8emDQIQZeuTKuDYib8VJDyZbhgrMeIuMjhTaCGq S/Imw7Tz+xXHkX9YQBNEvhlIALjK2W9Iak8/HjQlpZmFvAiU/sabGSW08d5M68UrbfQG PH+lajO5+PZTGuWbdvgrI2QHiNCTfACWEgt7Jal79X8yikMvyK65qXYrpxanU8Kz2wZc iJdy7bypTlzGXY253dZJGuB49EDsA95JtDKhHILnth5KtRYJeGPwZTaG+4xA70RCt3Yc /GrB7y3ngz2ur7rBF3HCnEuWEvf0IGPfUg2m73kzqHJT2wnq6jlz/nu3Bb8VqsGfMmLt fnpw== X-Gm-Message-State: AOAM530YITEX8v1yuZyyrFBFdoKLdAACdGa+bcxYMVL5hjnOHLwZzzpr 0YXaKpiTPs6ktSz1YEOD4jg= X-Google-Smtp-Source: ABdhPJwCE2i/PMu0ZLvVFCAPgiI7YPCqLiY3wi0vWCwhmwqtEKfZ+9KhiZPyE2CS+uon6yCDmN/bvQ== X-Received: by 2002:a05:6000:1d83:b0:203:ed96:fa4c with SMTP id bk3-20020a0560001d8300b00203ed96fa4cmr9919302wrb.400.1650786259896; Sun, 24 Apr 2022 00:44:19 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id i7-20020a5d5587000000b00207a8cde900sm5769411wrv.19.2022.04.24.00.44.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 00:44:19 -0700 (PDT) Date: Sun, 24 Apr 2022 09:44:17 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] staging: vt6655: Replace MACvReadISR with VNSvInPortD 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 MACvReadISR with VNSvInPortD. Last patch within this patch series will replace all macros VNSvInPortD with ioread32. 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 | 4 ++-- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 7cceb57a5139..c21787f32252 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1029,7 +1029,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) u32 isr; unsigned long flags; =20 - MACvReadISR(priv->port_offset, &isr); + VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr); =20 if (isr =3D=3D 0) return; @@ -1116,7 +1116,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) ieee80211_queue_stopped(priv->hw, 0)) ieee80211_wake_queues(priv->hw); =20 - MACvReadISR(priv->port_offset, &isr); + VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr); =20 MACvReceive0(priv->port_offset); MACvReceive1(priv->port_offset); diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 74b45e1f0963..5aaa0de20e67 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -666,9 +666,6 @@ do { \ VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue); \ } while (0) =20 -#define MACvReadISR(iobase, pdwValue) \ - VNSvInPortD(iobase + MAC_REG_ISR, pdwValue) - #define MACvWriteISR(iobase, dwValue) \ VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) =20 --=20 2.25.1 From nobody Sun May 10 21:17:39 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 02975C433F5 for ; Sun, 24 Apr 2022 07:44:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238588AbiDXHrb (ORCPT ); Sun, 24 Apr 2022 03:47:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238571AbiDXHr1 (ORCPT ); Sun, 24 Apr 2022 03:47:27 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11FEC17D48E for ; Sun, 24 Apr 2022 00:44:26 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id bg25so6789953wmb.4 for ; Sun, 24 Apr 2022 00:44:25 -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=y6d3QvwCWUkOHo4Nv6Umw+CYKaT+QPo1Bwdbb14LmYU=; b=m/IUbfawZHI/czKAqYEd1rwhTJsIsd5jB2srww5IrZZk92bRIA86BFZ2yFtqa4f/mI 5moQLajc8hy9UCZMm5K7GMPgUONwOpugYnHtsZqXG4j3J8t15KhBJubDLNLnT5wUlZgA ZT3dcla/0GAZlsoJ7tPpfqOuz4icjnToqdpd/dBuJAzMlfsu+HTBubBlqvYgWAuXGeX/ DyyfQgybIrZgbMt20fFethTZZoWov99uRlqnsgNbNbsdbeRZFUMmRKgKXSI8QhOJ07XN 6gJpK7I/X/nN6ejrFh7h4vnEysu/uz+6o3/rlJGsYBh4cahMEOYSgSDxN324W5JNojqv AmnA== 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=y6d3QvwCWUkOHo4Nv6Umw+CYKaT+QPo1Bwdbb14LmYU=; b=NZhKe+Y8EZC8kfO7Db1RDkl4ddBBsozSkFc/ket1YRsC0VhOKqY2AFrfZ/Cu8j9Pb8 G2RRLcDR9mpOgaPrNYsVKBvlxYppOJps+LAwY+/DL6Ya07xnRgoc4q9mHfLVEMBJ3f02 9UwIDXmVDk2NOMCloFFRKB6m56srAshGmQV5hkO6XPtJxUMMlJPC+mFFZerFHY9CarXw gtYRLjrXkXhA2L+RP0ZPJIr6uZvKaM3nhDOwad1S3PXZTBKzOpFQOiNQZdovZsyc0S4N aHemCJzejwENI7WG0UnIxejm07ujEoLKJbiD6XtdeP0rVRaqgSTvcC5rpn3ClUF3Np+a iQJA== X-Gm-Message-State: AOAM531vrE2Hpi5tZfqIzpe5tpfkXx4CxAvPsQEQWqE0SFbkXP5PyJte Gs2RQ57L9VxQPTb2meBtRIDPD8jbqGE= X-Google-Smtp-Source: ABdhPJwk3Mjh5EeGOh6zHL2gt37HSwzmr44mKBs4YzRN66Opb7ijOGJokkt9Tti7VEilOraOqU9OuA== X-Received: by 2002:a05:600c:4e4a:b0:392:88e1:74a7 with SMTP id e10-20020a05600c4e4a00b0039288e174a7mr20767339wmq.174.1650786264720; Sun, 24 Apr 2022 00:44:24 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id k23-20020adfb357000000b0020ad7c36332sm1479001wrd.110.2022.04.24.00.44.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 00:44:24 -0700 (PDT) Date: Sun, 24 Apr 2022 09:44:22 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] staging: vt6655: Replace two VNSvInPortD with ioread64_lo_hi 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 two macros VNSvInPortD (32 Bit reads) with one ioread64_lo_hi. The names 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 Reported-by: kernel test robot --- Used this code for testing: VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF); VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1); dev_info(&priv->pcid->dev, "CARDbGetCurrentTSF *pqwCurrTSF: %llx", *pqwCur= rTSF); dev_info(&priv->pcid->dev, "CARDbGetCurrentTSF temp_ph: %llx", ioread64_lo_hi(iobase + MAC_REG_TSFCNTR)); output: [ +0.000085] vt6655 0000:01:05.0: CARDbGetCurrentTSF *pqwCurrTSF: 117e7e [ +0.000005] vt6655 0000:01:05.0: CARDbGetCurrentTSF temp_ph: 117e7e [ +0.000009] vt6655 0000:01:05.0: CARDbGetCurrentTSF *pqwCurrTSF: 39756d7f [ +0.000005] vt6655 0000:01:05.0: CARDbGetCurrentTSF temp_ph: 39756d7f [ +0.000009] vt6655 0000:01:05.0: CARDbGetCurrentTSF *pqwCurrTSF: 39756d8d [ +0.000004] vt6655 0000:01:05.0: CARDbGetCurrentTSF temp_ph: 39756d8d --- drivers/staging/vt6655/card.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 022310af5485..5da25140ed4b 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -30,6 +30,7 @@ #include "desc.h" #include "rf.h" #include "power.h" +#include =20 /*--------------------- Static Definitions -------------------------*/ =20 @@ -753,8 +754,7 @@ 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); + *pqwCurrTSF =3D ioread64_lo_hi(iobase + MAC_REG_TSFCNTR); =20 return true; } --=20 2.25.1 From nobody Sun May 10 21:17:39 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 DDBA6C433EF for ; Sun, 24 Apr 2022 07:45:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238636AbiDXHsA (ORCPT ); Sun, 24 Apr 2022 03:48:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238574AbiDXHrq (ORCPT ); Sun, 24 Apr 2022 03:47:46 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08E3F17E21B for ; Sun, 24 Apr 2022 00:44:33 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id x18so16726834wrc.0 for ; Sun, 24 Apr 2022 00:44: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=au6OP3T7ZHPNQ6sb5Bz2kPDT8OBTWIe8DZ+Sd+EF8Zg=; b=RpXgfDr75l0KG5N7VzfongQHJpB2IOknQOb7Uj5LjF0aia36fEVDu+v9Jag41s+g77 oe0yfTOeflvymZv1qtSL1aDmZK0BqIJhUxtq2erwMDF3ocW2+R+M96yF2qOJPhkj2Wjx to05ZLcJjnsLYwPQrBAeD9j0p3LlBUAp/oZdGyXPLDt5RMEPQ46blHYhbhTFUcbPQ94P s4drH8NtY/Ap49j++1I0qeqf72RvB2GvMCaNTWjBG/27swKdQ2g3PlaOu8GwV0G1TdWC /r2JQWje+e2QO+IY9qGu4uLmtTeX+qy8LSCRiAKSbhyZdvnHi3HeX5TcWekyYIOHL8DY OFEA== 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=au6OP3T7ZHPNQ6sb5Bz2kPDT8OBTWIe8DZ+Sd+EF8Zg=; b=B/Gz9a2WKKLiHu8J31qLC4qmEo540Ni1qYNnq2vbZr0ETZhi1niX3zD6tkh+aZtOqp ynmSuDG/st0N9j7CHHbMQWyARsVuSDA4NkSBTCgmEDNrCGM/3cb9gRhzgF/iudG5wwyW 9PyhQCC3UdCI2UErTLRMTsTIBL3U/CNHw0/CDrk63qhdpeEwB9yPGGDaxWKomvW8Ov0X JVjhqvLojF1dT8aVB70/4Gc9TVBl7yZQe3vpIBcrWGxk4ONc8q0/i4hkr7cww3mzG2uy NFrLlZr/k0OJPbgjdTicJ6Fp2l/ccPegXQcMTk2Znak2mVO5caqXQxnRo/e45DLNFjwW +OJw== X-Gm-Message-State: AOAM532w1cAxhsqg0ErciDsF2+iSyehz0Hxp5Z9ophzW08bFMSbzNd7z JEWOx735XFfZcxmP2hfd7iA= X-Google-Smtp-Source: ABdhPJzcP+psa1Rt93JzRrM3x/qcATxeuWZMvRVKksGiGP90W5+5brCHpdpm4HEOy7uYutCjVf1kSA== X-Received: by 2002:a05:6000:18a8:b0:20a:8a58:1639 with SMTP id b8-20020a05600018a800b0020a8a581639mr9781511wri.483.1650786271519; Sun, 24 Apr 2022 00:44:31 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id o38-20020a05600c512600b00393ead99c5bsm490109wms.26.2022.04.24.00.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 00:44:31 -0700 (PDT) Date: Sun, 24 Apr 2022 09:44:28 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] staging: vt6655: Replace VNSvInPortD with ioread32 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 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 V3 -> V4: Removed casting of the output variable --- drivers/staging/vt6655/device_main.c | 6 +++--- drivers/staging/vt6655/mac.h | 18 +++++++++--------- drivers/staging/vt6655/rf.c | 2 +- drivers/staging/vt6655/upc.h | 3 --- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index c21787f32252..12fd825c23fe 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1029,7 +1029,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) u32 isr; unsigned long flags; =20 - VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr); + isr =3D ioread32(priv->port_offset + MAC_REG_ISR); =20 if (isr =3D=3D 0) return; @@ -1042,7 +1042,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) spin_lock_irqsave(&priv->lock, flags); =20 /* Read low level stats */ - VNSvInPortD(priv->port_offset + MAC_REG_MIBCNTR, &mib_counter); + mib_counter =3D ioread32(priv->port_offset + MAC_REG_MIBCNTR); =20 low_stats->dot11RTSSuccessCount +=3D mib_counter & 0xff; low_stats->dot11RTSFailureCount +=3D (mib_counter >> 8) & 0xff; @@ -1116,7 +1116,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) ieee80211_queue_stopped(priv->hw, 0)) ieee80211_wake_queues(priv->hw); =20 - VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr); + isr =3D ioread32(priv->port_offset + MAC_REG_ISR); =20 MACvReceive0(priv->port_offset); MACvReceive1(priv->port_offset); diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 5aaa0de20e67..5b684194745c 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -618,7 +618,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 \ @@ -628,7 +628,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 \ @@ -638,7 +638,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 \ @@ -648,7 +648,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 \ @@ -684,7 +684,7 @@ do { \ #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) @@ -692,7 +692,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) @@ -700,7 +700,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) @@ -708,7 +708,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) @@ -716,7 +716,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 4d09cf18ebe0..a5b74aaadcd3 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