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 E9CD6C433F5 for ; Wed, 27 Apr 2022 05:42:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357914AbiD0Fp2 (ORCPT ); Wed, 27 Apr 2022 01:45:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357909AbiD0Fp1 (ORCPT ); Wed, 27 Apr 2022 01:45:27 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D896157839 for ; Tue, 26 Apr 2022 22:42:17 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id y3so1160079ejo.12 for ; Tue, 26 Apr 2022 22:42:17 -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=SMHZgrL14j5Eu1vGvc1pa7d08VpLRco0ITN1E2naAGU=; b=hwnuYTwi4Z5GZc7YCqkVM+xwZHPM0hta6hRXgAbn/USsuEC0vV6avH+LJclxaMLUU2 OtLZzgxSMmUoXMgazlyhd/dcZ2x6OFKvoU0uy1f/BPTebIAwOSiQuOxI5vX9gEmqkLH6 pWMGfVHBWSKhFB/PYXVQ9nvTf8dd2iPm8uY4hvgqGCwwQ5bNJEZrHipIXJrWnxN0T1SB Y4Ria3wzmKFLgAH3JOWWRpB/mOhlRsL570AWJgsQHtDrUuZKrc57+/dceh2SkQUyyr6N eiRGo7XyUgbrCwWjx9m0HAPUP+Fi7DflKX6OHrjLxjH+pxXSLw9yJCs7ft9QXEYelPeA nUIw== 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=SMHZgrL14j5Eu1vGvc1pa7d08VpLRco0ITN1E2naAGU=; b=BrWF0soi7L3oRcHc9+fz12i2IjBbQbwFcSZjevDLz9Dj2uQnHVede6fgPZtNO4smkN hPnCme9educc19ZSLhqySE8izgiUBE5GUycWiKC/yaN4K3nYVF3uAMEHqUe76EnasYLd esjAIYTvAjkLoWVNnqLz1e4e1qZt9dg3Qose+HZ4wHNzyv0K1WyjRrEC3DNdIMffeBlD b3mfnMJWrKYNxK22mO6fR/f54F/H911iI7NY6yNOqppqOEbsThlQGx9eOtcUiBqsfBi3 Zf5kV0MRLej0IA4IArZOKL6/6UGCamj5HxX2/diiZhZLJBT/+73e0erdgY3H3Ldci/uR Cjhg== X-Gm-Message-State: AOAM532zGZ4dsYKFyU+c2NXV5EU22Upe3FNHqSpQR/aPZRYjPewFqzKK l2cX6W4OyyhaChNnFJ+nJp0= X-Google-Smtp-Source: ABdhPJy02EToPB7vA/s4nyBZ4B7b3ijKtBR6+W66CPzwBC60CX6c8sNh345MK1O/F+erU3M69O+U7Q== X-Received: by 2002:a17:907:961c:b0:6f3:a3f9:bcef with SMTP id gb28-20020a170907961c00b006f3a3f9bcefmr9665241ejc.425.1651038135826; Tue, 26 Apr 2022 22:42:15 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id l20-20020a1709062a9400b006ce71a88bf5sm6056299eje.183.2022.04.26.22.42.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 22:42:15 -0700 (PDT) Date: Wed, 27 Apr 2022 07:42:13 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] staging: vt6655: Replace MACvReadMIBCounter 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 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 V2 -> V3: Added missing version in subject --- 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 31B7CC433EF for ; Wed, 27 Apr 2022 05:42:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243435AbiD0Fpg (ORCPT ); Wed, 27 Apr 2022 01:45:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357925AbiD0Fpc (ORCPT ); Wed, 27 Apr 2022 01:45:32 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4A00157812 for ; Tue, 26 Apr 2022 22:42:21 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id b24so656821edu.10 for ; Tue, 26 Apr 2022 22:42: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=7Twn2M/aG8ry6M+Vp8Ty89zIl1BTO6nNE/uGo9m1G2I=; b=IvSlC5IeQ61BTR+fxOTMquh3dwuQQfW1I+isdOGbUdT49h/y64bYg1Ty+GvEVNOhv8 31+qIsY8xdKeex8USo8QV/0IXc4KYuxzwqa9CZC0cJkMauWZ0PuGXMCx3rCbwoYLkFjS 4xOPWR+3A/qsz6qGddKAA02IteAE8/4O+rV+Q89lqVPXX6CQ4PpdY1T1fhmad34vvKiD zb3nw4sLrMMGvkCNaaKkPXQsL/RF29f+6i4cSngwybyXhrxy7LHRjGHwbVVcEqFBQmUS omzGwZwjawsUkir7wKaGII2hmJp0F2MAZ9kfYjw4/4mHfAzW+RyB3c77pvbx9h7aNuzw +TeA== 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=7Twn2M/aG8ry6M+Vp8Ty89zIl1BTO6nNE/uGo9m1G2I=; b=lQuJ2PGkhiziekk2BM64cq7jtEMqGIpPNwHyH4XYCp6FZUJ0ou2i4LY6Coweu0tlMi Y8QASbe7uHpRQvHt/mRwUF1oUk9x20z5my6oGgMJfv8jgmBxNUK8WFfmzvs0w760N1Tx NZ6tqeI6IWKMFwpSMpxjtjnJJ/233k5qaYumi25j66QgLWXK1F8XuB4lhqxalQRwVuAD FfxlNV/N17VbPsHQzSa0y+xoaMy5yWaMAIsPTfDvA1HhLaOhM4HkcJGvvmm342yZgpmv +633DA30YsbB8xmd1kED1ZyLNUpXYqPHm5vRjjGKPpyeQn6gjqZHd6jokiRFopV6ZLkf VyBw== X-Gm-Message-State: AOAM532gIot+LsGpND3WuOh6KJoFGAAwUGWuctJKzew+Uyh5ZxX8sv9k lCAbN9IbFj/hEING1MWugLCEahfela6UQg== X-Google-Smtp-Source: ABdhPJxaCxDvGhtQBBVE51ECwdwSwARlL6R5jtujsL7EP4+OhDh2fnTtoq8VMJ9KPoplaOsUtCgR8w== X-Received: by 2002:aa7:d310:0:b0:425:f22f:763f with SMTP id p16-20020aa7d310000000b00425f22f763fmr12066122edq.163.1651038140447; Tue, 26 Apr 2022 22:42:20 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id y3-20020a50ce03000000b00425bfb7f940sm7571748edi.11.2022.04.26.22.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 22:42:20 -0700 (PDT) Date: Wed, 27 Apr 2022 07:42:18 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] 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 and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann --- V1 -> V2: Shorted and simplified patch description V2 -> V3: Added missing version in subject --- 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 06A38C433F5 for ; Wed, 27 Apr 2022 05:42:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357925AbiD0Fpr (ORCPT ); Wed, 27 Apr 2022 01:45:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357924AbiD0Fpi (ORCPT ); Wed, 27 Apr 2022 01:45:38 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAF5215780E for ; Tue, 26 Apr 2022 22:42:26 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id g6so1235063ejw.1 for ; Tue, 26 Apr 2022 22:42: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=j3Q+1sKC/RTdxeiOg2TSi75FCSOigNzJovJ9453maM0=; b=VmKHfb8ecnztnRfZRqlEs0lb62r8k5H5nJ124ANMPqTANcbLuEMbDQe+UlLSmMaiY4 uPSFPFvD9x648fe+mzDQaTNDDWR8Bmnk/CD1igiaxhUAs2JF+UdUdNNfO50YCXCqBkvn FFhtBWXi24n5PyIFK72R6q/y/ZP+ZgkI3eRHtKar4NFoliX5nlZLWvmMjiPlb5v4KsmR GBqawaf6kt1u9paPPmI55T1hJeFHm4CxFqLaD4UjuGxzYCidFlx9Yw5kclnMlZnacTJo rZd9+q9Kby1cdtHXhgl11rLZkRaEPkbo5+tcyKwOvGj8Dz5U4LwNqOr9475sWh7U/u+b 7pNA== 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=j3Q+1sKC/RTdxeiOg2TSi75FCSOigNzJovJ9453maM0=; b=uDTPolnjsf6crLxjujtNrPa4VuYabUtQnu69AgkZGIXESLXOm/CDqoGFNh+ds+Hhv/ o3Gv3WlNZinhqh4/SefGfkub67UN4E2y/b7elv8B5uUeqyleHh0vgNw0WgbzBwygar7A 2t+8MsLu4DJiiIbWwD846V/0WvJMPT4pH3sTeOlhdfOhjj7OdEcLz3YPVm7/nCequslq aBKIghdM5nhJ+825MvJyjyPaSapEnJESdoaGnOJSgcy/nKe20EtK2Uc8lU94bKY9mO8r XruSWcAwMfLzANy91QHrWEHvqD5eCBlD8qExJIf+JCGTMbqPoFs9lXMABGU4ff22VNha 4EYA== X-Gm-Message-State: AOAM533cdBCTBQiDWtDqmwAl+l6dqYDbnPJOZ5I0Ut5puL6POl8q9Yzd xLqEZv5rIOy1BYKMOvwQbf9kexesKnu+bQ== X-Google-Smtp-Source: ABdhPJyx59r4ZbEy9Hu/9fhpc0f55Zg6dkMHkUfV+3mVwziiUHZJS2SdSR+AuActcb5InQZx/TEqVg== X-Received: by 2002:a17:907:3e96:b0:6e8:aeb9:4f91 with SMTP id hs22-20020a1709073e9600b006e8aeb94f91mr24849198ejc.314.1651038145423; Tue, 26 Apr 2022 22:42:25 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p54a074e9.dip0.t-ipconnect.de. [84.160.116.233]) by smtp.gmail.com with ESMTPSA id n10-20020a170906700a00b006efdb748e8dsm6086296ejj.88.2022.04.26.22.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 22:42:25 -0700 (PDT) Date: Wed, 27 Apr 2022 07:42:23 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/3] staging: vt6655: Replace VNSvInPortD with ioread32 Message-ID: <7a5f7f98379fb2af2741f613f5ddda53e5d4813e.1651036713.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 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. V5 -> V6: Added missing version in subject --- 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