From nobody Sun May 10 18:31:59 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 B6CB9C433EF for ; Tue, 26 Apr 2022 20:02:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354352AbiDZUFe (ORCPT ); Tue, 26 Apr 2022 16:05:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354346AbiDZUFb (ORCPT ); Tue, 26 Apr 2022 16:05:31 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FE381A3B4 for ; Tue, 26 Apr 2022 13:02:22 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id p18so18512172edr.7 for ; Tue, 26 Apr 2022 13:02:22 -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=IcyuOtlGkrHpiyVRHzfMUPq93LO4hiMR0wu0sGE6h1A=; b=i0jSI/MY02miYxjMbMT0TKDysQ+XAl/mRs6m2SDrlO6CLHPV2YTVkef50KHzGzo4zj vTPtP8t/Aq05A+i8sSc6Ob8qgfLnVOYq6MqUDHFsRgkehZrJ9mH5o9KF3YJMaMgvRcH1 frbTqFkXHoExt+KVvbyYAG/xvApSxI66p25tloqCYkhzQ4EfTl6UgjuYf4AN603u8qJI n36Gp7EQVPZPFtNYHeF5y57vb5UCGucuC4j5ga9OMhS6d68wOVfCo951ZaxQvSOliu+W dwlmYjZMq4TbXQZuxes2XWp+LNNO3xWSNbSXSqvQyQCL9VkInliHJci93ma/dNAD+yzA R/Iw== 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=IcyuOtlGkrHpiyVRHzfMUPq93LO4hiMR0wu0sGE6h1A=; b=dsWquLdoiFMXYtO+pg7XpYVUfJ1Z3cZzDVkQ88aYHKis2OYH8jqGZsDzjEoVDo4XLk Y9OAHQUSAWSwm0tsUxDUjk9pdxDeIoqkcZAaq3n1TdRW2ImlmOqkDozYH5apVD3Fs3dV pVYoDbQ2KUG+ivfwLOFMNgvb+joCLuOQFXBldWehjAEWWWQlzsLgjp2cbDQ3eOgH6WU9 obja6WcBmvpOySxUN7Sc91X1XfgL2QINgoGWrDtUKJ95ZewGax1mT38LM2/1IZ9UIJ6d TWF3URUb/UVRZGK7BmvyWuI9XaOM7HFi9KGmK5jic5ghkkGjZdZMfIWzUABg4W/voJ+O 3XhA== X-Gm-Message-State: AOAM532ReMZoZGqyjM1FEwtVfmAeEhtguo7WDMd/rrc8Hhlqx52YLUla gfZ3hYHLplKYSmFFx/N5ENI= X-Google-Smtp-Source: ABdhPJxRQiA+UJ8cidWqFEJAN0lTQ1uxCUTB7bCP3hQSs3eEw8GAF9Y7bhfG7xoGhKsBQdwAbbyWVA== X-Received: by 2002:a05:6402:d5:b0:41d:6518:86e4 with SMTP id i21-20020a05640200d500b0041d651886e4mr26407725edu.322.1651003340826; Tue, 26 Apr 2022 13:02:20 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id s11-20020a170906284b00b006e108693850sm5312576ejc.28.2022.04.26.13.02.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 13:02:20 -0700 (PDT) Date: Tue, 26 Apr 2022 22:02:17 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] staging: vt6655: Replace MACvReadMIBCounter with VNSvInPortD Message-ID: <50cbf7b87759dbfe023554fc42a499dd923b7f8c.1651001609.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 and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann --- V1 -> V2: Shorted and simplified patch description --- 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 18:31:59 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 388F9C433F5 for ; Tue, 26 Apr 2022 20:02:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354358AbiDZUFi (ORCPT ); Tue, 26 Apr 2022 16:05:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354354AbiDZUFf (ORCPT ); Tue, 26 Apr 2022 16:05:35 -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 87DB71A825 for ; Tue, 26 Apr 2022 13:02:26 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id bv19so38261053ejb.6 for ; Tue, 26 Apr 2022 13:02:26 -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=nKYj1zApLX3Siev5H3zAoIfh5wybFWsTCDDUKvzfiUg=; b=ZlB/E0idSI22FbmVUHDGhF8PfXOtPl5Jfp+73C5JW2Fcq3EV7NNQw5W6Pgy9ruImOq 3yTNE2EwVS1Ivg+eJRzbuwmaaR2xqst83JZSA761RmB7VzejKU8+Y474j2Itd8ohe+m0 RovrzxYmpS/q5OqUlJ6om0Sg9B5hxVzfPWM9Yy6q/LhD1t+vySfzC53xQmmWINaWgtPz vO7Cm7hEntgT3CDns+A8mLsGx6sawSI6tr5kkQnjEn5xWlTtj1A0fFk7tr3iI6yQAHOG LLO/BSOH10rlOXuys7rKGnqHYlB+YkaeVF0nZKDTQbpF35J4VxegxkntsdXU2DTHi3Go aLlg== 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=nKYj1zApLX3Siev5H3zAoIfh5wybFWsTCDDUKvzfiUg=; b=RqEQ7g2S47twsTUXv6Nep5BDOqb+go0B84OY9Jd/pfk+kBrB6LXXL1OE645N7X57+U Op659kbrbtG449E6QnkXPqFLZl6v4uO778a4Q0C2X0dEjsII3n7kTMkU9VpPaj8BCe/3 Em/HM+BL9rCCqrOrEvrEILVpMoH0dDmder0LPd8oo0ULlt3ofEHq31fy6ZwSXqdxKUYI FHIG47vTGBOpW/h9gjAJpblv/Y6OUzqhteE0LbfuCLbsZyP0JsV/yQt1WqYn3GHtyzhF Mu1CdrQX5cdozd52WnIFbHuvdFyV759l/33sk8TAIBb2Ph9O4WTTbb1qeipQgfjVEDBQ g/vA== X-Gm-Message-State: AOAM531CaT5g5c1+APJGlGr2zQhEJXKXh4x/ikdFJEpiJso+onbcj/a0 F2i8yGVIo+OVD0NqQIKLT04= X-Google-Smtp-Source: ABdhPJyo9ATeFt/36fxCFBPwfX7wkygBsrGYk+hR9bNNjn3ebHcJUgpgIlM7WkoO8E9iHgHtT6QP4g== X-Received: by 2002:a17:907:1ca8:b0:6f3:6d36:b2e3 with SMTP id nb40-20020a1709071ca800b006f36d36b2e3mr17980811ejc.88.1651003345022; Tue, 26 Apr 2022 13:02:25 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id i2-20020a1709061cc200b006f386217c6bsm3638526ejh.124.2022.04.26.13.02.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 13:02:24 -0700 (PDT) Date: Tue, 26 Apr 2022 22:02:22 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] staging: vt6655: Replace MACvReadISR with VNSvInPortD Message-ID: <66146b6881b792206eccb7ba7eacdfbaea56ab42.1651001609.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 MACvReadISR with VNSvInPortD and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann --- V1 -> V2: Shorted and simplified patch description --- 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 18:31:59 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 8E6E3C433F5 for ; Tue, 26 Apr 2022 20:02:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354361AbiDZUFr (ORCPT ); Tue, 26 Apr 2022 16:05:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354354AbiDZUFk (ORCPT ); Tue, 26 Apr 2022 16:05:40 -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 8177D193C9 for ; Tue, 26 Apr 2022 13:02:31 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id l18so11622901ejc.7 for ; Tue, 26 Apr 2022 13:02:31 -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=uRZWlzOPZ2Uc0kI1zeu2LNhnfyRWk86dNqP6u92c+lg=; b=aD8LKbZg8nPro/TF3pLc8801cSDoI79JyCSAH6TAIOqG+xb6/+eXC3nBglXsxl1txj v+jKhtN8BaCRUvQtpHiuJi0/EfpEWPj0dLAUstmJvPBcSlYRFSMG9aMZJvBO6opDPFoj 4cfMKgqCMeB4VO97NCtxx39Tx0zW5gKBHO138c2FVD4O3skn/l77fdYj43iMbILmQR1R DrcST6IElBouR6UtcTgqf45uN6JffL8Sl0q3X1NLOVTVHG4HKLbRNaKg+Jt1q+FnMW69 75D0zIdYG1FYmCgWiYPhAVEpi7gKEpfkOk6WSG422Xr8Okvz3ku64NQMeF75bnIFVfD3 3HPQ== 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=uRZWlzOPZ2Uc0kI1zeu2LNhnfyRWk86dNqP6u92c+lg=; b=Aea1JXSHNDvWuyuUviEDX8e5Zw+D41AZjnLIZkQ8BwRnblO5uEAbSpNvDL+QvUlpOF Bs3IrjIhxVXNkDDSY2dTNbjw8tRDQ7+sBYwN7WjKUtKWO4o7rmdtzUYi53TpJOxKFlvB t2DgANhSnrwxzI/Yev4aG/7kOPVD6snPtSqy3a3BK9VDRjXMPZM1NLmGNG6OVuocdpcB W2QnkQzR9LHmHkv5vP8t2RoEZbK3Fm6rfoHJnVQSwQeJhVypRL4b2DCQnU2a5np6Vxlh NV3/xBDo8hYmHZ9IQOUexambJMzqQxEO2JZP6khcVHW+ymN/NUV3PbxaTiWH5Qbe77cc 8Zyw== X-Gm-Message-State: AOAM531Sig2wQg9KFgmBL4V9ACVxl39xHu33nM/i3mE4BZLrdLXrs3Df ezub5ygQrUTbmWeexDH00buEIH4/9KIWvQ== X-Google-Smtp-Source: ABdhPJxc8Z2gfJLn9OLEfpYQ+0bX9N6uTR04Mj4ok3OI2me8mam2gr473RRT1AbMTeIozP4boaBLxA== X-Received: by 2002:a17:907:1c98:b0:6f3:7588:3f59 with SMTP id nb24-20020a1709071c9800b006f375883f59mr17238715ejc.686.1651003350064; Tue, 26 Apr 2022 13:02:30 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id c6-20020a50f606000000b00425adbac753sm6891658edn.21.2022.04.26.13.02.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 13:02:29 -0700 (PDT) Date: Tue, 26 Apr 2022 22:02:27 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] 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 and as it was the only user, it can now be removed. The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl Reported-by: kernel test robot 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 V4 -> V5: Joint patch "Replace two VNSvInPortD with ioread64_lo_hi" with this patch. Changed ioread64 to two ioread32 as ioread64 does not work with 32 Bit computers. Shorted and simplified patch description. --- drivers/staging/vt6655/card.c | 6 ++++-- 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 --- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 022310af5485..0dd13e475d6b 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -744,6 +744,7 @@ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *= pqwCurrTSF) void __iomem *iobase =3D priv->port_offset; unsigned short ww; unsigned char data; + u32 low, high; =20 MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); for (ww =3D 0; ww < W_MAX_TIMEOUT; ww++) { @@ -753,8 +754,9 @@ 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); + low =3D ioread32(iobase + MAC_REG_TSFCNTR); + high =3D ioread32(iobase + MAC_REG_TSFCNTR + 4); + *pqwCurrTSF =3D low + ((u64)high << 32); =20 return true; } 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