From nobody Thu May 7 17:41:40 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 529FAC433EF for ; Sun, 22 May 2022 19:48:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350265AbiEVTsz (ORCPT ); Sun, 22 May 2022 15:48:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230252AbiEVTst (ORCPT ); Sun, 22 May 2022 15:48:49 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B73C38BE9 for ; Sun, 22 May 2022 12:48:47 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id gh17so11721326ejc.6 for ; Sun, 22 May 2022 12:48:47 -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=c0kDX2w0usdtJZ1wjubssadkVa9RQCCYPM/2J54JHbU=; b=Zx+JfWo20KMaPBqsbs3SpMWK3e8JgYZeZkJ6cRLH2PdWs9omM9WN84HKnrNxAoMP+p X/C6xyowLMTB8LLHNCZlWpcdh7aikJJcWnN2aSqhxQEIsIlb7uvDo3PWSaKz3M3xuMnX ma7SxF6IU2pjYx9xD5OtGbi8fSAvTDEsiqLrVu00zcNAFoPtoTY8fRshyRzxNZklM+Kp bs7CWirKEMduEM1K3eBtLfRdSfRZt68Jnn+TxzQ31hzRJouINVZHNjN+dkvg0ye++vzg RUklCL7YYLa2xmpY3PYuyEc2ryKX/35L2KRmjQZAoZxjweaDwBxhOAggs3cQMMczqWhh LsCg== 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=c0kDX2w0usdtJZ1wjubssadkVa9RQCCYPM/2J54JHbU=; b=30GyrZREJgGmcCngM8SR5PYX3/z5o1E0Ew4af2fqZVMkw7yyXU9w+rFly/4cnhN0LI dr8LA6DOsT7AI9Rlu+cNps+CGAkyQwubitEL3JicRls83pwf7JIXdsyd6KDjqDhHgveJ u2iZnsnIH/DDMxaH/98dHmM35G/W1mMXj9qYaDUYMjMTBFCBiQhIeyW4CsRwo1GplJjq AQ9CAKnXM39G0IVIdviowj1VuQXMpRRolRRDPQED8Nhr9RE7MeM1aJZ+P/9ddhOMGL1o b5fZeFZiycXHgWpLNcvhXBVyhghnpLMWUKPZthy5ix57TY7hX56aEmuHr60q60ISxZLa jflA== X-Gm-Message-State: AOAM532HrUmF7dRDfhtT2yz36YBOcJtTe/bVwhMBMViUZshfZS/qxmz+ /ZZllXu6c+YXDhr3dqrtL5q0wPe9Xe8= X-Google-Smtp-Source: ABdhPJxmWErdjdV8qfgsfdFM33uNPONcPlWXYRfVcUQcBUVa3xbGAwA2MHBZP4HfxL6lR5nrfX6XWQ== X-Received: by 2002:a17:907:94cd:b0:6fe:a2ae:a696 with SMTP id dn13-20020a17090794cd00b006fea2aea696mr13129035ejc.656.1653248925573; Sun, 22 May 2022 12:48:45 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id n20-20020a509354000000b0042aa23fa93bsm7523895eda.20.2022.05.22.12.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:48:45 -0700 (PDT) Date: Sun, 22 May 2022 21:48:43 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] staging: vt6655: Replace MACvSetCurrBCNLength with VNSvOutPortW Message-ID: <8ff556c84b3a4a70e8151965bcf6357e1de61bd1.1653203927.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 MACvSetCurrBCNLength with VNSvOutPortW and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.h | 5 ----- drivers/staging/vt6655/rxtx.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 57ae3bdbdb2d..23ebae99e0ae 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -570,11 +570,6 @@ do { \ VNSvOutPortD(iobase + MAC_REG_BCNDMAPTR, \ dwCurrDescAddr) =20 -/* set the chip with current BCN length */ -#define MACvSetCurrBCNLength(iobase, wCurrBCNLength) \ - VNSvOutPortW(iobase + MAC_REG_BCNDMACTL + 2, \ - wCurrBCNLength) - #define MACvWriteBSSIDAddress(iobase, pbyEtherAddr) \ do { \ iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 71cbfa607d96..54b0556f500f 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1422,7 +1422,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, =20 MACvSetCurrBCNTxDescAddr(priv->port_offset, priv->tx_beacon_dma); =20 - MACvSetCurrBCNLength(priv->port_offset, priv->wBCNBufLen); + VNSvOutPortW(priv->port_offset + MAC_REG_BCNDMACTL + 2, priv->wBCNBufLen); /* Set auto Transmit on */ MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); /* Poll Transmit the adapter */ --=20 2.25.1 From nobody Thu May 7 17:41:40 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 B76FBC433F5 for ; Sun, 22 May 2022 19:49:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230252AbiEVTtE (ORCPT ); Sun, 22 May 2022 15:49:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350287AbiEVTtA (ORCPT ); Sun, 22 May 2022 15:49:00 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECF5238D99 for ; Sun, 22 May 2022 12:48:53 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id i27so24739876ejd.9 for ; Sun, 22 May 2022 12:48: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=GQBG72Umvxbor3m/gsK6TvVWuWrjeEpDqxp7epo9DKM=; b=XDW311sIMxWEL5sWKDGU116vuUoGIiofSD1sHIEHluh/4t1ATrrYnJ8+ouaMm9n3xr Y2sxF0Rh7NQPdkZ8D8Te5uzQHyQen7lkPNMvsiVfTlftIqLrF0vbAYwqnPi4vAUrLAdd H84YyxK5nknkgFS4mdhEXLR4gXSDZ7AWWACOIPyKyrm3ib/3RqkRl6e3ZEqr5yeqtkLC SWTQ8L7woKzzBa1uTEOoawH+7ypBBWN9TogPd5/4k29IMPWA4qL0WQjh/XWONBz7Yc5T qClj6519NHbeOfzdiBh+EM/Alq1bzqBr9MZBDbFnq4acesqqoRoILm/zxHGcOsLJobYZ OCsw== 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=GQBG72Umvxbor3m/gsK6TvVWuWrjeEpDqxp7epo9DKM=; b=AaETW8r/depa8L/du4gMA/H2l7T1l2NXQbUTxaHoMELBFgCNAs909+c4Wslhy3oAS8 NURs1VhCFZZ4N7XcPMc7z3LEbrfq38d/1XVb5K5qDQ195kV0RcezMYuVGPAGwEJQykX7 H+HD0smtKSJKdYqrSYd9xvm8n+SIdRZezFGwg3JBJefFW7RXkofuzdN7wJWE4RW7vvYA N4k2+zef6s/+HY8C3v8bdyQ1mLRbizV+x2TAhM3MtkaQOd9cnYxthoJS9aLOcnd/i8Ma EevFZDOwODCBwDTU4qiO2GkAaBr3Bd2umpPW9sTKPRzZojNx4rQSX1JXTkXMCUBx4FSx Xcyw== X-Gm-Message-State: AOAM53393W0h6AC3mLDQvTjORqZ3pCEF0/CPIbqRTvCT7PVVWYAHU/oO BEHWiHAtd044x8/QC3yCa0Wa4ruySZs= X-Google-Smtp-Source: ABdhPJwDGUy6O/FfVOZRpv8vepm7g7+eaYLMyLM00OOoljCea9/uvOi+rKzfnOi1W4pOZveCSHliHw== X-Received: by 2002:a17:907:d22:b0:6f4:8766:2042 with SMTP id gn34-20020a1709070d2200b006f487662042mr16654389ejc.259.1653248932492; Sun, 22 May 2022 12:48:52 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id kt1-20020a170906aac100b006fecb577060sm1130600ejb.119.2022.05.22.12.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:48:52 -0700 (PDT) Date: Sun, 22 May 2022 21:48:49 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] 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 because it replaces just one line. The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/card.c | 29 ++++++++++------------------ drivers/staging/vt6655/device_main.c | 3 +-- drivers/staging/vt6655/mac.h | 4 ++-- drivers/staging/vt6655/power.c | 4 ++-- drivers/staging/vt6655/rf.c | 2 +- drivers/staging/vt6655/rxtx.c | 2 +- drivers/staging/vt6655/upc.h | 3 --- 7 files changed, 17 insertions(+), 30 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 2cde0082fc03..72043a29b543 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -326,7 +326,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); @@ -587,68 +587,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 afaf331fe125..5f28d9ea4232 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 23ebae99e0ae..ebadf527a911 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -548,7 +548,7 @@ do { \ do { \ unsigned short wData; \ wData =3D ioread16(iobase + byRegOfs); \ - VNSvOutPortW(iobase + byRegOfs, wData | (wBits)); \ + iowrite16(wData | (wBits), iobase + byRegOfs); \ } while (0) =20 #define MACvRegBitsOff(iobase, byRegOfs, byBits) \ @@ -562,7 +562,7 @@ do { \ do { \ unsigned short wData; \ wData =3D ioread16(iobase + byRegOfs); \ - VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \ + iowrite16(wData & ~(wBits), iobase + byRegOfs); \ } while (0) =20 /* set the chip with current BCN tx descriptor address */ 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 ee5e2e0d9a8c..ff6f654df2d2 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/rxtx.c b/drivers/staging/vt6655/rxtx.c index 54b0556f500f..390b27b02562 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1422,7 +1422,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, =20 MACvSetCurrBCNTxDescAddr(priv->port_offset, priv->tx_beacon_dma); =20 - VNSvOutPortW(priv->port_offset + MAC_REG_BCNDMACTL + 2, priv->wBCNBufLen); + iowrite16(priv->wBCNBufLen, priv->port_offset + MAC_REG_BCNDMACTL + 2); /* Set auto Transmit on */ MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); /* Poll Transmit the adapter */ diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 2a47f5782b71..0f2f7df00b3a 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 Thu May 7 17:41:40 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 EC07EC433F5 for ; Sun, 22 May 2022 19:49:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350386AbiEVTtI (ORCPT ); Sun, 22 May 2022 15:49:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350257AbiEVTtC (ORCPT ); Sun, 22 May 2022 15:49:02 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2E7638D94 for ; Sun, 22 May 2022 12:48:58 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id f9so24841952ejc.0 for ; Sun, 22 May 2022 12:48: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=HFVukygACe6EUdSdvL43yBPTzSujU+tWVdTau6xPeDA=; b=LdfwdIcjabMdR4vnA1Wix0Iuglxk8n0yUqLAnxGW8p5jYB0mk7ATKmLD/JcpxGmLzJ wNZbrBZ4TRS7S2052kV+b6+fvazOY+Xw0dgpg2lAbBZMQ4ejmt4AxM5Db283gPIeBqVI Pre4cYyZnP/NYSTo3qiA/NaHL0kdvKe1p1VpgOtQSUGp2aos+Vy7UVuRf/tgQO+YV70S SJs4Pbg0FQebmWWN4VjQyNO/h3TrjpLAkuRn2PhbRzK5EOkHRNcbHh7TR+6dyLIu12XN qkj6sTMiVfqvh8DccQPz/RqSHS6q8C06+ukB2N/wT3wAPOePfBUr1nyqKohCCy5YE77M GAlA== 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=HFVukygACe6EUdSdvL43yBPTzSujU+tWVdTau6xPeDA=; b=7fHpgZ7KkQaKQ+kWwVwQIyHgSb4KX0Zt7C2J6Lqw7Mlj9nGtys12LOAZ8QhDy61/1c nE/Qdz0Z0rShZdTrc7ghNcN2CWiNX9hY1ESOaS7S6w3xdEkSn/+nyf2Nc0lNQ1PO2FQ8 n4V2TSIjFYbJjC4jguxBqrihZ0qF+THZtjiQ+mYTnGx9GWuAC/LZcRS1gl0XBD5Lg4Rp cSgQsX4llzW3BinEAPctpXtzqr8Qum6XjiYAiV0d865BuEYiWF0Q7KF20NP7rT8kd6Hz Sj0wUk+SH3flsoKsjQZs+g3GZmx5LLCvozqQuIMMJ050juKgp2MHtGYLDjRtGMXmX+LO EvNw== X-Gm-Message-State: AOAM530PoVMootI/79mMqF8+/GGrlSXURc/dueccx2nhPUWKDW4+tMsF RjtamyZI3J4VDlW9q3RNZiQ= X-Google-Smtp-Source: ABdhPJwML15aoNxYXzWXSWz/IgfhUL/W32v2njx4R/N3yEy6Xu2tQJLqWUXT9Dt4GB0tUe8/jnAu2w== X-Received: by 2002:a17:906:ece3:b0:6f3:da10:138a with SMTP id qt3-20020a170906ece300b006f3da10138amr17138973ejb.438.1653248937218; Sun, 22 May 2022 12:48:57 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id q1-20020aa7d441000000b0042aae0a4699sm7375630edr.60.2022.05.22.12.48.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:48:56 -0700 (PDT) Date: Sun, 22 May 2022 21:48:55 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] staging: vt6655: Replace MACvWriteISR with VNSvOutPortD Message-ID: <80cd68a83807209230a898ab0260188adfad4158.1653203927.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 MACvWriteISR with VNSvOutPortD and as it was the only user, it can now be removed. 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 5f28d9ea4232..41bc87d80ad8 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1055,7 +1055,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) * update ISR counter */ while (isr && priv->vif) { - MACvWriteISR(priv->port_offset, isr); + VNSvOutPortD(priv->port_offset + MAC_REG_ISR, isr); =20 if (isr & ISR_FETALERR) { pr_debug(" ISR_FETALERR\n"); diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index ebadf527a911..42b216897218 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -648,9 +648,6 @@ do { \ iowrite8(byOrgValue, iobase + MAC_REG_STICKHW); \ } while (0) =20 -#define MACvWriteISR(iobase, dwValue) \ - VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) - #define MACvIntEnable(iobase, dwMask) \ VNSvOutPortD(iobase + MAC_REG_IMR, dwMask) =20 --=20 2.25.1 From nobody Thu May 7 17:41:40 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 1652BC433F5 for ; Sun, 22 May 2022 19:49:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350469AbiEVTtZ (ORCPT ); Sun, 22 May 2022 15:49:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350365AbiEVTtH (ORCPT ); Sun, 22 May 2022 15:49:07 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F47638D8B for ; Sun, 22 May 2022 12:49:03 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id i27so24739876ejd.9 for ; Sun, 22 May 2022 12:49:03 -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=FNHzluLfUaxr3+BQTAbtyKvp8fT7fI8o/97d48qjwEY=; b=Gc6PP9O5kmtr7+f6CYWJFeV/nPQoLRNIJbhOqwTHyP+8+noBd6fliNCRQ8SB9dCMbN OHh5AR76iTS9vIAgAVw1jYYSzgc+9YihBssc/uHDTdikm08rnyZcaoqDJF6hyqzL3X9/ PMIsG1Br8Lu3OO6Fugm7lzo2Ec+EvGz+BJK5sPyPDV6VTCgWwp6669geA1OYjJ22p+YL p48TJVASCCrpzwzLnw7AzusmVw/SfxDONd+NGKwOjyXKyGyJvMhcw3vmzNHjHVT+k3vS UdqozxK/KRrYLUvpK82hOcs83kTfYIJNqvSaD+UjUmJogFu2J+RD4JRE4tbSN+1ENDVl OsBA== 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=FNHzluLfUaxr3+BQTAbtyKvp8fT7fI8o/97d48qjwEY=; b=fv2w53/YurLqPibJwpGIjbz4V8HLrfOrA37NK8nzGcXJQD5OazPQoUGyy0DJ5kSX30 aTlJ7FxbDCldPpBwyK+IftTcnpy4IcEGbRsY2JS5yv+FhxzLhVTVCmblwIXoaGUDuq1N SLHXmClRVj3I/nVcPW9X5cWY/OKekd2v39jTmx0UTlTlQMnFRIVxuJ0feH1Mk7/b1/c6 8QjBt0hmtKpyCcSlzl/2nkVKPwYSqBK3R5vBwLyLpkxThqiccDqAL2DU1UP4kFShScun bhopUx85YNCRjyHrHqvlzhCGZGLgytkfKdMgyyf6FRpwWo9Xfx5aA+eKJvZBm3WBBpOY ZFiA== X-Gm-Message-State: AOAM530Bm5K0z7AbTUTg7all44E+ZiVINxWXKMcv6q+lg/KIAZ1aJgWr VVWwwVnIRiPRIo5KkR/zmzQ= X-Google-Smtp-Source: ABdhPJwjLF6jhbzfPNQSBNJ5VLTvc5LkVQN0UxNaUNqqLN/7wVLH4oBdiS3b9+q/2uPv0Z+txqyEQw== X-Received: by 2002:a17:906:3b8d:b0:6fe:94ac:2a78 with SMTP id u13-20020a1709063b8d00b006fe94ac2a78mr17268539ejf.547.1653248942981; Sun, 22 May 2022 12:49:02 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id s17-20020a1709060c1100b006fee27d471csm419653ejf.150.2022.05.22.12.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:49:02 -0700 (PDT) Date: Sun, 22 May 2022 21:49:00 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/11] staging: vt6655: Replace MACvIntEnable with VNSvOutPortD Message-ID: <182b9f8edd1ce3f6ff12a2942e990dae0f80099a.1653203927.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 MACvIntEnable with VNSvOutPortD and as it was only used twice, it can now be removed. Signed-off-by: Philipp Hortmann --- The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl VNSvOutPortD will be replaced in this patch series. --- drivers/staging/vt6655/device_main.c | 6 +++--- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 41bc87d80ad8..d9515eff05c3 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1134,7 +1134,7 @@ static void vnt_interrupt_work(struct work_struct *wo= rk) if (priv->vif) vnt_interrupt_process(priv); =20 - MACvIntEnable(priv->port_offset, IMR_MASK_VALUE); + VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE); } =20 static irqreturn_t vnt_interrupt(int irq, void *arg) @@ -1252,8 +1252,8 @@ static int vnt_start(struct ieee80211_hw *hw) =20 device_init_registers(priv); =20 - dev_dbg(&priv->pcid->dev, "call MACvIntEnable\n"); - MACvIntEnable(priv->port_offset, IMR_MASK_VALUE); + dev_dbg(&priv->pcid->dev, "enable MAC interrupt\n"); + VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE); =20 ieee80211_wake_queues(hw); =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 42b216897218..8b3ba94dd02e 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -648,9 +648,6 @@ do { \ iowrite8(byOrgValue, iobase + MAC_REG_STICKHW); \ } while (0) =20 -#define MACvIntEnable(iobase, dwMask) \ - VNSvOutPortD(iobase + MAC_REG_IMR, dwMask) - #define MACvIntDisable(iobase) \ VNSvOutPortD(iobase + MAC_REG_IMR, 0) =20 --=20 2.25.1 From nobody Thu May 7 17:41:40 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 C14E5C433F5 for ; Sun, 22 May 2022 19:49:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350383AbiEVTtS (ORCPT ); Sun, 22 May 2022 15:49:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350490AbiEVTtP (ORCPT ); Sun, 22 May 2022 15:49:15 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9272339BA4 for ; Sun, 22 May 2022 12:49:09 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id s3so16675666edr.9 for ; Sun, 22 May 2022 12:49: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=FNWznZkulIMYNowiLsOOq4crWOkzIZB3zkl1x+nxEYk=; b=WjfcoATzt3hNYeH2AHh5TRL31O/Pn4F3cCp7tIewhnfIL+eCkqU6mbHZWHaxMOPgfr hStaViL+j2cL7s6pdjV8aI+MmZfmDZyDWXGkLW9J2FgrBCoERywPYB6uZ0wtYZP2vjip Ylmexkqu+TudiI+GOOy+Q90SXY5fBY2+HEKoIijsvClrat6DN2JYeQHl64oCAUZrhtF5 4HrO58Uz5YVmHHE3c86jbJSqVK1nLHyp/4ukH2xeyiJ17s4gQG1ADeVwXBwI0dqJJ+Vi qQLNsqrF97hLJYMyAK9v9KCAjZBjwnyul/0OFq6cQ094ToCWqTOnkfTVAe37RO/D4zjT p0tg== 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=FNWznZkulIMYNowiLsOOq4crWOkzIZB3zkl1x+nxEYk=; b=PhK+H7wwjxnLB3SAegwCCNQsESNUEDWEvbVdlHci0vD4DNUa6y5DPHFDtVT7wZztSc bGUodvQbb/jTKhmqhHLQoiDhrERVhXOJJ4e1Vi8Xf1JAhrSCXcTBagSpo1CJu7TvjpT4 TvK5l3Ndo7QbEsNCRnO/FxNO+kQ35I2GuHeMXZRe0KyVWasiHchehChVmjdXWL8pbaLC CCnoxgsFnCFjJKJZYkyV7XG4uTW0hzemVFDprx6AYAmXU8C1QGKJbPEsDz0EEbYy6TH8 Xct1ifBFKZGLaqmIYaUgt+uQgWa2o/kWwnevOICdFuuewPQxCaZL0hC6rJhEkXaQi7+F wGyw== X-Gm-Message-State: AOAM533AfexhvT3BiDMmwO8dOxCiljWULewTgZ8rKDbgXY3NSbo6dTRG SDum7ZpJgQWyeBdGkQ79TSVKgFQo1rQ= X-Google-Smtp-Source: ABdhPJw49jVp8vhlPLRd/5b8v3ikWX8mLZ2slVCuAe3WOVgQ8nHlWHY2U1ehczaTsyM5srHyGLKKcQ== X-Received: by 2002:a05:6402:4026:b0:42a:d1cb:34c4 with SMTP id d38-20020a056402402600b0042ad1cb34c4mr20836661eda.396.1653248947430; Sun, 22 May 2022 12:49:07 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id d24-20020a056402145800b0042aa5a74598sm7318262edx.52.2022.05.22.12.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:49:07 -0700 (PDT) Date: Sun, 22 May 2022 21:49:05 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] staging: vt6655: Replace MACvIntDisable with VNSvOutPortD Message-ID: <937422bb879d8f1f58978bedc8d15559d28581c7.1653203927.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 MACvIntDisable with VNSvOutPortD and as it was only used twice, it can now be removed. Signed-off-by: Philipp Hortmann --- The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl VNSvOutPortD will be replaced in this patch series. --- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/mac.c | 2 +- drivers/staging/vt6655/mac.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index d9515eff05c3..29ee0fd893cc 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1143,7 +1143,7 @@ static irqreturn_t vnt_interrupt(int irq, void *arg) =20 schedule_work(&priv->interrupt_work); =20 - MACvIntDisable(priv->port_offset); + VNSvOutPortD(priv->port_offset + MAC_REG_IMR, 0); =20 return IRQ_HANDLED; } diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 88ddd0676463..24eab18972d2 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -458,7 +458,7 @@ bool MACbShutdown(struct vnt_private *priv) { void __iomem *io_base =3D priv->port_offset; /* disable MAC IMR */ - MACvIntDisable(io_base); + VNSvOutPortD(io_base + MAC_REG_IMR, 0); MACvSetLoopbackMode(priv, MAC_LB_INTERNAL); /* stop the adapter */ if (!MACbSafeStop(priv)) { diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 8b3ba94dd02e..a1d5eb52ddc4 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -648,9 +648,6 @@ do { \ iowrite8(byOrgValue, iobase + MAC_REG_STICKHW); \ } while (0) =20 -#define MACvIntDisable(iobase) \ - VNSvOutPortD(iobase + MAC_REG_IMR, 0) - #define MACvSelectPage0(iobase) \ iowrite8(0, iobase + MAC_REG_PAGE1SEL) =20 --=20 2.25.1 From nobody Thu May 7 17:41:40 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 5C0ADC433EF for ; Sun, 22 May 2022 19:49:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350525AbiEVTtk (ORCPT ); Sun, 22 May 2022 15:49:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350435AbiEVTtg (ORCPT ); Sun, 22 May 2022 15:49:36 -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 98A6E38BFF for ; Sun, 22 May 2022 12:49:14 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id gi33so16268785ejc.3 for ; Sun, 22 May 2022 12:49:14 -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=tW0vbsqNyBqWB8eLL+zLqE/3yrno5YNaQTHqzB2WNng=; b=CanW3o/0o7Jp9mq96FqklsTPi1uCmU/qtWV7warAwwNfuZSx/IOX9GSUQaCh/OXvbT LjhpL4jqooFmFpYAzSfB4DJd7xPItmL7RPPx98S3DZTIfLYeT2aZ5G22D7K6n+27JPsq LIl2vqmI7gi3cGs/ZMaW0WTlY4SV4l0xG+MQIwTLnQdTu7Tn6Hbof2ePagFwaJZgNaE7 n4HVCs87I+vwn3bJc3a0IKugkSHdaPN2p7fDk5O9fds47e49cCWwxQpaC87ZV5kQhR0o xSNvCK0bzfR35kLXASDo9x8MRsBKpu+Axw44yxEPC7Pm+4aM/eUNAlfsU8hOD5vphvJK ZhFg== 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=tW0vbsqNyBqWB8eLL+zLqE/3yrno5YNaQTHqzB2WNng=; b=FW9FruMKPnp/hIF9WQqzeNg/xeCpghIO53VvomdfpNOlo2cF5S2xwEv6bEpc8JKGxa jKGtJTE+tYcPo2zWR7OEgDL56TGJv8xVfArXnI4frGhdiy9Myp0++qPfKVaoumpe7Jjz u+IYm//kY2ilFi53XO4MtuSn32S/DKafawxEcA8yIPjcnZ1zX9AyX7Gmr8G854DSn+w+ Vw5Y9BMDMYj7dZdXeU371bBFFq6fQNLiAsQUg31OvWk5xhvP6kwVcKelW8mIYKPIMQkJ 4MkfSvtzlAGeQ/OuvAIkzzEbDSpkwLV+ZSBYL9LAGzFIY3SLjrvCxJxTJ1mCMIXvdolm yYjw== X-Gm-Message-State: AOAM533Fe3oD4KN1HvtCdUgaXTf+NJC38u6LfUqSDLyo4XYng2dUD5jv K/bBAPIgKjTjLyZ8nadOxewRmJEwWIs= X-Google-Smtp-Source: ABdhPJwF+yD1jv0wGZgcBf3rKgRIMvhBNXlvV3liHMIFonghMV8p+lKTdUB9PPOFuwfSLSKwW9IiyA== X-Received: by 2002:a17:907:8c8c:b0:6fe:ecbf:3412 with SMTP id td12-20020a1709078c8c00b006feecbf3412mr495869ejc.377.1653248953106; Sun, 22 May 2022 12:49:13 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id sa24-20020a170906edb800b006fe8ac6bc69sm2782191ejb.140.2022.05.22.12.49.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:49:12 -0700 (PDT) Date: Sun, 22 May 2022 21:49:10 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] staging: vt6655: Replace MACvSetCurrBCNTxDescAddr with VNSvOutPortD Message-ID: <1db079979f7e0e3535463d9f31204aa708c6f680.1653203927.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 MACvSetCurrBCNTxDescAddr with VNSvOutPortD and as it was only used twice, it can now be removed. Signed-off-by: Philipp Hortmann --- The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl VNSvOutPortD will be replaced in this patch series. --- drivers/staging/vt6655/card.c | 3 +-- drivers/staging/vt6655/mac.h | 5 ----- drivers/staging/vt6655/rxtx.c | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 72043a29b543..23804cd72477 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -411,8 +411,7 @@ void CARDvSafeResetTx(struct vnt_private *priv) MACvSetCurrTXDescAddr(TYPE_AC0DMA, priv, priv->td1_pool_dma); =20 /* set MAC Beacon TX pointer */ - MACvSetCurrBCNTxDescAddr(priv->port_offset, - (priv->tx_beacon_dma)); + VNSvOutPortD(priv->port_offset + MAC_REG_BCNDMAPTR, priv->tx_beacon_dma); } =20 /* diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index a1d5eb52ddc4..89a3979aeb10 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -565,11 +565,6 @@ do { \ iowrite16(wData & ~(wBits), iobase + byRegOfs); \ } while (0) =20 -/* set the chip with current BCN tx descriptor address */ -#define MACvSetCurrBCNTxDescAddr(iobase, dwCurrDescAddr) \ - VNSvOutPortD(iobase + MAC_REG_BCNDMAPTR, \ - dwCurrDescAddr) - #define MACvWriteBSSIDAddress(iobase, pbyEtherAddr) \ do { \ iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 390b27b02562..03c2ab8489fa 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1420,7 +1420,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, =20 priv->wBCNBufLen =3D sizeof(*short_head) + skb->len; =20 - MACvSetCurrBCNTxDescAddr(priv->port_offset, priv->tx_beacon_dma); + VNSvOutPortD(priv->port_offset + MAC_REG_BCNDMAPTR, priv->tx_beacon_dma); =20 iowrite16(priv->wBCNBufLen, priv->port_offset + MAC_REG_BCNDMACTL + 2); /* Set auto Transmit on */ --=20 2.25.1 From nobody Thu May 7 17:41:40 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 97F9FC433F5 for ; Sun, 22 May 2022 19:49:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350587AbiEVTtw (ORCPT ); Sun, 22 May 2022 15:49:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350548AbiEVTtg (ORCPT ); Sun, 22 May 2022 15:49:36 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECAC339B97 for ; Sun, 22 May 2022 12:49:18 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id h11so15552885eda.8 for ; Sun, 22 May 2022 12:49:18 -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=X6jHoHps0q5WNAhJR5TeansVVs6HOJArSyVry609OmE=; b=anSEG6e8tIilMqbhKKmHRNGTK4djBcS/4Yye8KoEGF+scQ1DfG9hfJYdZ7iBi6mbUX Xu+kqpGEiXudJa6UsPqEBcen4K2ovB7I+J0Gb8NG6zW2KHo2W5/Mp2jLBesYdo/InXfi BSOCD4V3F/Qesxhe1RehyI/hzhAEBfTbvJ/33/tEqCBc9K69piz6Um0j5jfOZTD2dqpN jVdN8XmfEtS6rXsjzduTiBhKq/+zMSRNn/Zi/gcfRxHYIXCDqOxRs1RvrKpQtII10XoG orWP7ShLrdzlHf4ilmgnWrztlKpXpM8vmtKhgm4VDW+H53JHYbfvILbPMwRr7jqV6Atm az8g== 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=X6jHoHps0q5WNAhJR5TeansVVs6HOJArSyVry609OmE=; b=tUDjLqG/CasvcEmBIzBwUaww5t9VZhk4w1OHfNml9EAacDKkPF06Fs3Nk0xHBxBQgm C3b/yLUzczQv39GP54W1OAYzxqsuTWrZ/mXQDyOJF11f4bsXB7+jg9OLAdK9LrvzNdf1 Y76p7nyxPUogdAMd0Yc5giY8Ai9ZXCqHuJpIqDeM7zUwJMNI/7Judis1fFsJCDQjAH3Q mKljCIoXvleJdn9CqMl5J1CPH5SAGnYk5tK3em/czBGhEGPP0iJJ+H6hOZyQFZGbxYyQ RHoy9Bigppx8wnwFPJEt1Z4YpwnyRMfDbwjazUbip2mGxm4wlCVJZ7fA5UlVEEGfIVlB g0ig== X-Gm-Message-State: AOAM531khOPk+xpd+3q4RYatY50HfML/L3IwZrIud7ZDNcNmXIAOqUBq OLNMS6OuYPzNPtsUHwd4sjk= X-Google-Smtp-Source: ABdhPJzEEj6JiHv7UsJL0p9sxDBh4ctR7qH6KGaieu0hL9XlKxheAkc+y9AfcOFhKOj9f3z+vwLo8g== X-Received: by 2002:a05:6402:1914:b0:42b:698a:608b with SMTP id e20-20020a056402191400b0042b698a608bmr2322920edz.5.1653248957449; Sun, 22 May 2022 12:49:17 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id f10-20020a056402160a00b0042617ba63a7sm7239964edv.49.2022.05.22.12.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:49:17 -0700 (PDT) Date: Sun, 22 May 2022 21:49:15 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] staging: vt6655: Replace MACvRx0PerPktMode with VNSvOutPortD Message-ID: <3da471693a65adb75a637805ee6d564ddafccdda.1653203927.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 MACvRx0PerPktMode with VNSvOutPortD and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 23804cd72477..e907dfd58d1f 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -452,7 +452,7 @@ void CARDvSafeResetRx(struct vnt_private *priv) } =20 /* set perPkt mode */ - MACvRx0PerPktMode(priv->port_offset); + VNSvOutPortD(priv->port_offset + MAC_REG_RXDMACTL0, RX_PERPKT); MACvRx1PerPktMode(priv->port_offset); /* set MAC RD pointer */ MACvSetCurrRx0DescAddr(priv, priv->rd0_pool_dma); diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 89a3979aeb10..161130084936 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -589,9 +589,6 @@ do { \ iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ } while (0) =20 -#define MACvRx0PerPktMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) - #define MACvRx1PerPktMode(iobase) \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) =20 --=20 2.25.1 From nobody Thu May 7 17:41:40 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 97E22C433EF for ; Sun, 22 May 2022 19:49:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350365AbiEVTto (ORCPT ); Sun, 22 May 2022 15:49:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350485AbiEVTti (ORCPT ); Sun, 22 May 2022 15:49:38 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4664839BAB for ; Sun, 22 May 2022 12:49:22 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id i27so24739876ejd.9 for ; Sun, 22 May 2022 12:49: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=rlKCcc3Cfz4SOeHsE7kOSMH+pFkJNujvAhxMEYVEh9Q=; b=q5kfaCelUWQv/xUP6MeweT3/24WiJmRTKt/7UVHBd/KoXUBH0lWbJyL3MhV5okLzvt 1/zuRxuqRBzMhckB/NVMQtoKsSygQW4edvm9kWQDpGIKCaUIZB9LxV7kf4jVARhgYYm9 IzTHX0SrZ+9VA4OushDVjyo2egmUUiGX4aaTM9U8lD3T7V3LjrNXmPJSi3oB/LnUdmEE BVhI7M3yZSWlnXEtRLPWIC5D8AGu7suf1wLhnyEdUuKS9qAi6kWjcbfDNxqCJRcDTalk EAko7lf8V3MktQ0v2Q7KXmXF6LdnTCrBd7GnZlOmwmiHCdx6oHbXTwg7XuUGCKrvJMRU iodg== 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=rlKCcc3Cfz4SOeHsE7kOSMH+pFkJNujvAhxMEYVEh9Q=; b=i949qjWvSgTgSDJhsPUwQRV5xAdX2KZWm2ZVe9aT5uL5T6Er5DXgUWVgWibu+lld0Q Uy7VAPExV3R29Q/WOZFCbXZ0alGHARo2oCMRgyGPkqKdadBxJgQ072Cp/aaHtq1wj98w fp8/gb1eVd1M8PlII7Jd6A0Wfpmti0oxIl3qEkc9Y780gZDlQo/0GQBlV6RVZmjo9EPX uNjllRVLCRqeggy+CKl0uBWBtmIVWQcYlAA5PZfYlTZnUc6f28j2bYZqjTXPwcvgSu86 i9yoIWqaxjPOvb4fumThrOzyoVIpcJCvwdaiGDFdb0oNYW7cmjE3nQX5qAqVTleZxOKZ wzHQ== X-Gm-Message-State: AOAM530HnaZjaMkydNU3x0oDMZBhpzyLQHctkDKi8Y7f4ZqzkfaEjs/Z 6MTyxJE3+uQxaBaMzziicgo= X-Google-Smtp-Source: ABdhPJwolWOlDnZJcYlv0xEnTvnCXYVex1x24AP9SRExVk/EPWOzIPbGvT2MSXjWhrfsrLZBLHQUxA== X-Received: by 2002:a17:907:3e0f:b0:6f4:5cfd:e6bb with SMTP id hp15-20020a1709073e0f00b006f45cfde6bbmr17338557ejc.38.1653248961901; Sun, 22 May 2022 12:49:21 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id my9-20020a1709065a4900b006fe8d8c54a7sm4984540ejc.87.2022.05.22.12.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:49:21 -0700 (PDT) Date: Sun, 22 May 2022 21:49:19 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] staging: vt6655: Replace MACvRx1PerPktMode with VNSvOutPortD Message-ID: <9cb643b9554e33f5be7a2babefbed5eccca14625.1653203927.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 MACvRx1PerPktMode with VNSvOutPortD and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index e907dfd58d1f..57ed2120dbc1 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -453,7 +453,7 @@ void CARDvSafeResetRx(struct vnt_private *priv) =20 /* set perPkt mode */ VNSvOutPortD(priv->port_offset + MAC_REG_RXDMACTL0, RX_PERPKT); - MACvRx1PerPktMode(priv->port_offset); + VNSvOutPortD(priv->port_offset + MAC_REG_RXDMACTL1, RX_PERPKT); /* set MAC RD pointer */ MACvSetCurrRx0DescAddr(priv, priv->rd0_pool_dma); =20 diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 161130084936..b68e21c62d2b 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -589,9 +589,6 @@ do { \ iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ } while (0) =20 -#define MACvRx1PerPktMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) - #define MACvReceive0(iobase) \ do { \ unsigned long dwData; \ --=20 2.25.1 From nobody Thu May 7 17:41:40 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 0836DC433F5 for ; Sun, 22 May 2022 19:49:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350606AbiEVTts (ORCPT ); Sun, 22 May 2022 15:49:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350487AbiEVTtk (ORCPT ); Sun, 22 May 2022 15:49:40 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15CC23A1B7 for ; Sun, 22 May 2022 12:49:28 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id wh22so24626361ejb.7 for ; Sun, 22 May 2022 12:49:27 -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=nyTXQUynFitMTZztMwbVG0yiiDkfYZKbTZKsjCCO8+Y=; b=J7Se2oJcuIqEeYEPX4zYNEG6bNiwMK4EaU59QgULXWQTiStYqj9yZK7sbl9Ui9Jymo NqmuFRfRfljaJuvOnZgz5tbkanR35v6ZfCEA2ronxZuW7+LNKnWrsRsdLSb2ynO2hRRq OflrEP6yOP+/coEpsy+jp4aQb6uI3DuS1OQRVzbahPMqN7+iFFQ+AkAD8xClSpsxaSwP CC3dKzSLiciir+lKyhBLJvZYyqfn9qTHTo8RxlHgKNVumz6U8Evs/dKDf5X6fNmywd/d WSuOIRhzlsWasAEMgOw418fr2A8307qOrGe/6mANZwjYlgJzuAz6diV3SEDozcHFuY0K xzuQ== 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=nyTXQUynFitMTZztMwbVG0yiiDkfYZKbTZKsjCCO8+Y=; b=PAAF6olTw5rcZ9oJUJgsWg3I0rACEwlOJewHwp/rwQ+cCJCaL9NHfcOFeviKEOVzw0 4Cbh4ydYHC2ccQkIYfD4ZMnHwKOYojvpS1Q58SP+6julqZrAIDO8vRFg84ggMTMm+pxY i5aW2OQWPNqgu42ME5tZ+E6hv+MkroTUI2MeUS9tcLm6+qtLJDuC6PC54j6HqcV7u/zw iVl4aOeh2Ue/7Fy4ldtbUcmKNd57twuzc2UaH71EmlN0kqnk+YnLzJvbnZAvGNs+0OkD At5bXrUYYbL9assFyNeyFdQSfH1Y74EI4wQ3E42W7j8yqNwjveKh+P6C6Agn2TUEBYYT vY3Q== X-Gm-Message-State: AOAM530UDzcumLN4f5Aq0RNK+uqotEeEsFcLLPLBazTY2v2nYVdkiG0x clTEmZQZvf62sWvTyl0wEP4= X-Google-Smtp-Source: ABdhPJxoegm4xFuVuDIy3dkIRAvNSJfm91e1YQX6T9v9PXOOxg9Sn//CRO0clQ85jmkEhiAzTeLZGg== X-Received: by 2002:a17:907:162a:b0:6fe:c691:47f5 with SMTP id hb42-20020a170907162a00b006fec69147f5mr4807587ejc.289.1653248966361; Sun, 22 May 2022 12:49:26 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id i17-20020a170906115100b006fecf23fecdsm992741eja.127.2022.05.22.12.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:49:26 -0700 (PDT) Date: Sun, 22 May 2022 21:49:24 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/11] staging: vt6655: Replace VNSvOutPortD with iowrite32 Message-ID: <03b6ff0250aa797f45a855ff2fc76f8013f73dc0.1653203927.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 VNSvOutPortD with iowrite32 because it replaces just one line. The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/baseband.c | 2 +- drivers/staging/vt6655/card.c | 33 +++++++++++++--------------- drivers/staging/vt6655/device_main.c | 22 ++++++++----------- drivers/staging/vt6655/mac.c | 2 +- drivers/staging/vt6655/mac.h | 26 +++++++++++----------- drivers/staging/vt6655/rf.c | 2 +- drivers/staging/vt6655/rxtx.c | 2 +- drivers/staging/vt6655/upc.h | 3 --- 8 files changed, 41 insertions(+), 51 deletions(-) diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/bas= eband.c index 577a38fae369..a5412ca0ea68 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -2013,7 +2013,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 57ed2120dbc1..7a4a8b3f164e 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -293,10 +293,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); } @@ -329,9 +327,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; @@ -411,7 +408,7 @@ void CARDvSafeResetTx(struct vnt_private *priv) MACvSetCurrTXDescAddr(TYPE_AC0DMA, priv, priv->td1_pool_dma); =20 /* set MAC Beacon TX pointer */ - VNSvOutPortD(priv->port_offset + MAC_REG_BCNDMAPTR, priv->tx_beacon_dma); + iowrite32((u32)priv->tx_beacon_dma, priv->port_offset + MAC_REG_BCNDMAPTR= ); } =20 /* @@ -452,8 +449,8 @@ void CARDvSafeResetRx(struct vnt_private *priv) } =20 /* set perPkt mode */ - VNSvOutPortD(priv->port_offset + MAC_REG_RXDMACTL0, RX_PERPKT); - VNSvOutPortD(priv->port_offset + MAC_REG_RXDMACTL1, RX_PERPKT); + iowrite32(RX_PERPKT, priv->port_offset + MAC_REG_RXDMACTL0); + iowrite32(RX_PERPKT, priv->port_offset + MAC_REG_RXDMACTL1); /* set MAC RD pointer */ MACvSetCurrRx0DescAddr(priv, priv->rd0_pool_dma); =20 @@ -552,7 +549,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, @@ -561,7 +558,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, @@ -570,7 +567,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, @@ -579,7 +576,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, @@ -798,8 +795,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 @@ -824,8 +821,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 29ee0fd893cc..c32c0328b602 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1055,7 +1055,7 @@ static void vnt_interrupt_process(struct vnt_private = *priv) * update ISR counter */ while (isr && priv->vif) { - VNSvOutPortD(priv->port_offset + MAC_REG_ISR, isr); + iowrite32(isr, priv->port_offset + MAC_REG_ISR); =20 if (isr & ISR_FETALERR) { pr_debug(" ISR_FETALERR\n"); @@ -1134,7 +1134,7 @@ static void vnt_interrupt_work(struct work_struct *wo= rk) if (priv->vif) vnt_interrupt_process(priv); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE); + iowrite32(IMR_MASK_VALUE, priv->port_offset + MAC_REG_IMR); } =20 static irqreturn_t vnt_interrupt(int irq, void *arg) @@ -1143,7 +1143,7 @@ static irqreturn_t vnt_interrupt(int irq, void *arg) =20 schedule_work(&priv->interrupt_work); =20 - VNSvOutPortD(priv->port_offset + MAC_REG_IMR, 0); + iowrite32(0, priv->port_offset + MAC_REG_IMR); =20 return IRQ_HANDLED; } @@ -1253,7 +1253,7 @@ static int vnt_start(struct ieee80211_hw *hw) device_init_registers(priv); =20 dev_dbg(&priv->pcid->dev, "enable MAC interrupt\n"); - VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE); + iowrite32(IMR_MASK_VALUE, priv->port_offset + MAC_REG_IMR); =20 ieee80211_wake_queues(hw); =20 @@ -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(0xffffffff, priv->port_offset + MAC_REG_MAR0); + iowrite32(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.c b/drivers/staging/vt6655/mac.c index 24eab18972d2..8e789ce055cd 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -458,7 +458,7 @@ bool MACbShutdown(struct vnt_private *priv) { void __iomem *io_base =3D priv->port_offset; /* disable MAC IMR */ - VNSvOutPortD(io_base + MAC_REG_IMR, 0); + iowrite32(0, io_base + MAC_REG_IMR); MACvSetLoopbackMode(priv, MAC_LB_INTERNAL); /* stop the adapter */ if (!MACbSafeStop(priv)) { diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index b68e21c62d2b..71de3aa7e7c5 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -594,9 +594,9 @@ 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) \ @@ -604,9 +604,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) \ @@ -614,9 +614,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) \ @@ -624,9 +624,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 MACvClearStckDS(iobase) \ @@ -648,7 +648,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) \ @@ -656,7 +656,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) \ @@ -664,7 +664,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) \ @@ -672,7 +672,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) \ @@ -681,7 +681,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 MACvSetRFLE_LatchBase(iobase) \ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index ff6f654df2d2..99850367293a 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((u32)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/rxtx.c b/drivers/staging/vt6655/rxtx.c index 03c2ab8489fa..736681274296 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1420,7 +1420,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, =20 priv->wBCNBufLen =3D sizeof(*short_head) + skb->len; =20 - VNSvOutPortD(priv->port_offset + MAC_REG_BCNDMAPTR, priv->tx_beacon_dma); + iowrite32((u32)priv->tx_beacon_dma, priv->port_offset + MAC_REG_BCNDMAPTR= ); =20 iowrite16(priv->wBCNBufLen, priv->port_offset + MAC_REG_BCNDMACTL + 2); /* Set auto Transmit on */ diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index 0f2f7df00b3a..c7966a638fde 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) - /*--------------------- Export Classes ----------------------------*/ =20 /*--------------------- Export Variables --------------------------*/ --=20 2.25.1 From nobody Thu May 7 17:41:40 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 EBB91C433EF for ; Sun, 22 May 2022 19:50:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350709AbiEVTt7 (ORCPT ); Sun, 22 May 2022 15:49:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350348AbiEVTto (ORCPT ); Sun, 22 May 2022 15:49:44 -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 DCAC33A5E2 for ; Sun, 22 May 2022 12:49:32 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id rq11so2650860ejc.4 for ; Sun, 22 May 2022 12: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=MLW54pUDQeelw1+w5KQ4Wc3ocZ3VALhByO07hnMjaHs=; b=Nn+PAzEcVQe8/826opqMJc389ynDSlB4yWocPjyJI5pwzuUHszrXBRxhs0+oiqu2Lu b/9ccX5jnZbBBklK4mWPI9Ln1YnjOU9Gjc9sCYUSSSGv12A8/Wr0BpyHVI1F3acCd6YN vz5muMIhD6P89g+nXnr09+bFZxZ3zoxq5qXXRNTo+VFRYsw7PO1GdbGUbS0GxolGqB16 SSJj7kZPA8qAbLkG9KAOC1w/UKxRiWC/g24snx4mV+DD1uJw/bAvg+upG1E+hCxX8Gop 1HdrsDm8pbVc2ovw1faM/m9oBSNZqOw3nUU5Rhu+Z1C0P8o35TTZQD1+zoyaAQLDQKoW l4ZQ== 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=MLW54pUDQeelw1+w5KQ4Wc3ocZ3VALhByO07hnMjaHs=; b=Ul0SoR5eILmUsHblRxploh1oICZSspwcQgoYlEhPfn9LxnHlQCw0K5RHGiO/62hVCp cVjWeABGrtJoSi7dyRZM1pKQ0g94T9945YQiy2oU4+hopaedrdleOyii6xtrzw7O1D+I wMFdXNebrl8bML680XPF8pfL3qruo9z2GhLYt/5cEebv3dPG5eaBYcLaCoKD8yYv1FVc yKicTbfJODb3HSDa/a5Z/2To1pPBxGT0tSzH6lUClget6Nj9/xX5oGqwdbOZzmoK4JVn rr+sCiqLEgW5YGesO/KDBCrO3cwtJd6bwadiuxTXflNP+qbRp6Kn0HXEP6Csgg+dwemK yZ1A== X-Gm-Message-State: AOAM533TwJor5UxRotl1aSmvL6r259xkBIivQUMfRZaTH5hK77oMl7/V 6XDXN1wU5OQgX9jd5qtE/rk= X-Google-Smtp-Source: ABdhPJwA4HcJDgqFzMHMJ3RV9hG9NTHYfNGhNfMFaMFUIdABxVnvg06BGdOiO9GDbMrkjMBKwWJZcg== X-Received: by 2002:a17:906:7751:b0:6ce:e3c:81a6 with SMTP id o17-20020a170906775100b006ce0e3c81a6mr16228737ejn.278.1653248971392; Sun, 22 May 2022 12:49:31 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id wc6-20020a170907124600b006fec8e8eff6sm1217645ejb.176.2022.05.22.12.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:49:31 -0700 (PDT) Date: Sun, 22 May 2022 21:49:28 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] staging: vt6655: Add missing BE support on 2x iowrite32 Message-ID: <974ef7a9244e7caeafd8c176c7b53a6de3c20219.1653203927.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" Add missing big-endian support when using two times iowrite32 to write 64 Bit. Signed-off-by: Philipp Hortmann --- Code for testing: dev_info(&priv->pcid->dev, "CARDbUpdateTSF little endian before con.: 0x%01= 6llx", qwTSFOffset); qwTSFOffset =3D le64_to_cpu(qwTSFOffset); dev_info(&priv->pcid->dev, "CARDbUpdateTSF little endian after con. : 0x%01= 6llx", qwTSFOffset); dev_info(&priv->pcid->dev, "CARDbUpdateTSF big endian: 0x%01= 6llx", be64_to_cpu(qwTSFOffset)); Log vt6655 0000:01:05.0: CARDbUpdateTSF little endian before con.: 0xff ff ff f= f fd b7 d5 fc vt6655 0000:01:05.0: CARDbUpdateTSF little endian after con. : 0xff ff ff f= f fd b7 d5 fc vt6655 0000:01:05.0: CARDbUpdateTSF big endian: 0xfc d5 b7 f= d ff ff ff ff --- drivers/staging/vt6655/card.c | 4 ++++ drivers/staging/vt6655/device_main.c | 1 + 2 files changed, 5 insertions(+) diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 7a4a8b3f164e..abc74a5633c7 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -293,6 +293,7 @@ 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 */ + qwTSFOffset =3D le64_to_cpu(qwTSFOffset); 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, @@ -327,6 +328,7 @@ bool CARDbSetBeaconPeriod(struct vnt_private *priv, iowrite16(wBeaconInterval, priv->port_offset + MAC_REG_BI); priv->wBeaconInterval =3D wBeaconInterval; /* Set NextTBTT */ + qwNextTBTT =3D le64_to_cpu(qwNextTBTT); 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); @@ -795,6 +797,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, =20 qwNextTBTT =3D CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); /* Set NextTBTT */ + qwNextTBTT =3D le64_to_cpu(qwNextTBTT); iowrite32((u32)qwNextTBTT, iobase + MAC_REG_NEXTTBTT); iowrite32((u32)(qwNextTBTT >> 32), iobase + MAC_REG_NEXTTBTT + 4); MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); @@ -821,6 +824,7 @@ void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 = qwTSF, =20 qwTSF =3D CARDqGetNextTBTT(qwTSF, wBeaconInterval); /* Set NextTBTT */ + qwTSF =3D le64_to_cpu(qwTSF); iowrite32((u32)qwTSF, iobase + MAC_REG_NEXTTBTT); iowrite32((u32)(qwTSF >> 32), iobase + MAC_REG_NEXTTBTT + 4); MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index c32c0328b602..204994692c90 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1529,6 +1529,7 @@ static void vnt_configure(struct ieee80211_hw *hw, } else { MACvSelectPage1(priv->port_offset); =20 + multicast =3D le64_to_cpu(multicast); iowrite32((u32)multicast, priv->port_offset + MAC_REG_MAR0); iowrite32((u32)(multicast >> 32), priv->port_offset + MAC_REG_MAR0 + 4); --=20 2.25.1 From nobody Thu May 7 17:41:40 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 DFBA8C433F5 for ; Sun, 22 May 2022 19:50:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350348AbiEVTuE (ORCPT ); Sun, 22 May 2022 15:50:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350584AbiEVTtp (ORCPT ); Sun, 22 May 2022 15:49:45 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A576539BA2 for ; Sun, 22 May 2022 12:49:37 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id eg11so16671196edb.11 for ; Sun, 22 May 2022 12: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=eultuTEo5w5eygrW9gVkDvFHvAk3bhGxWLnJbMnNQas=; b=dmk5A5Gk2wv1TJq84Ek34IX1JOsZb9SGnbiTbrmaPhS1PU5mIki4hE6pBQ2uRPJXWH 29SLdEoR98gF7l3bvjtPoXekV/57Gz+49xU/p5mNkpS7SfkoMNhC1fITQOPO8CM1xXWo Axg+ibMEkqjczg7HjvYMQ2FD/4dugG8Jh6OWAu1BzXoo7sO4Ph/rfAbPkZ+715sJU4Pa 9nnQqywU1bLkUe+aFOPDNNcxHZ+F73J5C+6RsfJQPcQyA2A+swbS6CH7IhFSXtPNlYl9 rAq6rOpv9PY3KZFUslCkUCH68Pysw2Ada47K9dBlj2Frpl70gsSexlWLyIuB49m40oql S9eQ== 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=eultuTEo5w5eygrW9gVkDvFHvAk3bhGxWLnJbMnNQas=; b=fFldaRmm4LIv1I+wELq15WD4TE1FpVRczD0A1IqWyLZYblOqaM+fhcNQaEWZmwdE/C pd7AJdwxhFIsVuKgWMm7QZw7GeUtocFsGOMTsgKcKoo43iWXI1EGjKuHEdpPZIF2Gt0S 8YMYglGQ0vavJ8YcQfIhk0KoJgVy4fTRZQTNahuOzXo+W8mOkpbSEZNW67OgV1W2Pa/3 vKpOqHVpW6fny7eNNUTXntd1tUJTDVVwv3H2QfCnNGP8ABJyjVeIdRThcksWkrllEmvj WucmjgWm+mWTmFLemxg0VigW/bMmQJu/V7BPadGsZaU/odDO39KJvGfzoa8TxvXLuf/X f4nQ== X-Gm-Message-State: AOAM530pR1I3AmEIDDaQr1qFGHzggFvZ9tvMuxTvMcbnOsCx501EiMDb 6Rz3OncHD+yZH2L5MldhjP4= X-Google-Smtp-Source: ABdhPJzyzizf2j0e6lvnG9ZsB8qqhd+6+XCsDStsjRAhRnG39LAWsBq7ksCgTulvxbX57X6ZomwNxg== X-Received: by 2002:a05:6402:2815:b0:420:c32e:ebe2 with SMTP id h21-20020a056402281500b00420c32eebe2mr21065747ede.1.1653248976241; Sun, 22 May 2022 12:49:36 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935774.dip0.t-ipconnect.de. [87.147.87.116]) by smtp.gmail.com with ESMTPSA id 6-20020a170906024600b006f3ef214e70sm5318456ejl.214.2022.05.22.12.49.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 May 2022 12:49:35 -0700 (PDT) Date: Sun, 22 May 2022 21:49:33 +0200 From: Philipp Hortmann To: Forest Bond , Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] staging: vt6655: Delete upc.h 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" Delete upc.h as all macros have been removed from upc.h. Signed-off-by: Philipp Hortmann --- drivers/staging/vt6655/mac.h | 2 +- drivers/staging/vt6655/srom.c | 2 +- drivers/staging/vt6655/upc.h | 29 ----------------------------- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 drivers/staging/vt6655/upc.h diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 71de3aa7e7c5..102e575c965d 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -18,7 +18,7 @@ #ifndef __MAC_H__ #define __MAC_H__ =20 -#include "upc.h" +#include "device.h" =20 /*--------------------- Export Definitions -------------------------*/ /* Registers in the MAC */ diff --git a/drivers/staging/vt6655/srom.c b/drivers/staging/vt6655/srom.c index 722a2cc9a473..ee5ca4db74dc 100644 --- a/drivers/staging/vt6655/srom.c +++ b/drivers/staging/vt6655/srom.c @@ -27,7 +27,7 @@ * */ =20 -#include "upc.h" +#include "device.h" #include "mac.h" #include "srom.h" =20 diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h deleted file mode 100644 index c7966a638fde..000000000000 --- a/drivers/staging/vt6655/upc.h +++ /dev/null @@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (c) 1996, 2003 VIA Networking Technologies, Inc. - * All rights reserved. - * - * Purpose: Macros to access device - * - * Author: Tevin Chen - * - * Date: Mar 17, 1997 - * - */ - -#ifndef __UPC_H__ -#define __UPC_H__ - -#include "device.h" - -/*--------------------- Export Definitions -------------------------*/ - -/* For memory mapped IO */ - -/*--------------------- Export Classes ----------------------------*/ - -/*--------------------- Export Variables --------------------------*/ - -/*--------------------- Export Functions --------------------------*/ - -#endif /* __UPC_H__ */ --=20 2.25.1