From 4cb07b36c8e295b1163de79410c188c12d4917bd Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:48:43 +0200 Subject: staging: vt6655: Replace MACvSetCurrBCNLength with VNSvOutPortW Replace macro MACvSetCurrBCNLength with VNSvOutPortW and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/8ff556c84b3a4a70e8151965bcf6357e1de61bd1.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 5 ----- drivers/staging/vt6655/rxtx.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'drivers/staging/vt6655') 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) -/* 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, MACvSetCurrBCNTxDescAddr(priv->port_offset, priv->tx_beacon_dma); - 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 */ -- cgit v1.2.3 From 33028eea5cf34036ee038448ef4278cf48cb0322 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:48:49 +0200 Subject: staging: vt6655: Replace VNSvOutPortW with iowrite16 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 Link: https://lore.kernel.org/r/ded437e27cffb040865d4afe47e447c2d0d6f0b8.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- 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(-) (limited to 'drivers/staging/vt6655') 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 = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); /* set HW beacon interval */ - VNSvOutPortW(priv->port_offset + MAC_REG_BI, wBeaconInterval); + iowrite16(wBeaconInterval, priv->port_offset + MAC_REG_BI); priv->wBeaconInterval = wBeaconInterval; /* Set NextTBTT */ VNSvOutPortD(priv->port_offset + MAC_REG_NEXTTBTT, (u32)qwNextTBTT); @@ -587,68 +587,59 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) 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_RSPINF_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_RSPINF_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_RSPINF_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_RSPINF_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_RSPINF_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_RSPINF_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_RSPINF_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_RSPINF_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_RSPINF_A_72); /* Set to Page0 */ MACvSelectPage0(priv->port_offset); 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); } 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 = ioread16(iobase + byRegOfs); \ - VNSvOutPortW(iobase + byRegOfs, wData | (wBits)); \ + iowrite16(wData | (wBits), iobase + byRegOfs); \ } while (0) #define MACvRegBitsOff(iobase, byRegOfs, byBits) \ @@ -562,7 +562,7 @@ do { \ do { \ unsigned short wData; \ wData = ioread16(iobase + byRegOfs); \ - VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \ + iowrite16(wData & ~(wBits), iobase + byRegOfs); \ } while (0) /* 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 = priv->current_aid | BIT(14) | BIT(15); /* 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 != NL80211_IFTYPE_ADHOC) { /* set AID */ - VNSvOutPortW(priv->port_offset + MAC_REG_AIDATIM, wAID); + iowrite16(wAID, priv->port_offset + MAC_REG_AIDATIM); } /* 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, unsigned char rf_type, unsigned char sleep_count = 0; unsigned short idx = MISCFIFO_SYNDATA_IDX; - 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, MACvSetCurrBCNTxDescAddr(priv->port_offset, priv->tx_beacon_dma); - 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 @@ /* For memory mapped IO */ -#define VNSvOutPortW(dwIOAddress, wData) \ - iowrite16((u16)(wData), dwIOAddress) - #define VNSvOutPortD(dwIOAddress, dwData) \ iowrite32((u32)(dwData), dwIOAddress) -- cgit v1.2.3 From 0fd13e6b1acee1c42569e70f93444b0c5fd7a348 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:48:55 +0200 Subject: staging: vt6655: Replace MACvWriteISR with VNSvOutPortD Replace macro MACvWriteISR with VNSvOutPortD and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/80cd68a83807209230a898ab0260188adfad4158.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/staging/vt6655') 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); 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) -#define MACvWriteISR(iobase, dwValue) \ - VNSvOutPortD(iobase + MAC_REG_ISR, dwValue) - #define MACvIntEnable(iobase, dwMask) \ VNSvOutPortD(iobase + MAC_REG_IMR, dwMask) -- cgit v1.2.3 From 159ed04755489cf9d43ee361899f736418c4c340 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:49:00 +0200 Subject: staging: vt6655: Replace MACvIntEnable with VNSvOutPortD Replace macro MACvIntEnable with VNSvOutPortD and as it was only used twice, it can now be removed. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/182b9f8edd1ce3f6ff12a2942e990dae0f80099a.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 6 +++--- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'drivers/staging/vt6655') 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 *work) if (priv->vif) vnt_interrupt_process(priv); - MACvIntEnable(priv->port_offset, IMR_MASK_VALUE); + VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE); } static irqreturn_t vnt_interrupt(int irq, void *arg) @@ -1252,8 +1252,8 @@ static int vnt_start(struct ieee80211_hw *hw) device_init_registers(priv); - 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); ieee80211_wake_queues(hw); 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) -#define MACvIntEnable(iobase, dwMask) \ - VNSvOutPortD(iobase + MAC_REG_IMR, dwMask) - #define MACvIntDisable(iobase) \ VNSvOutPortD(iobase + MAC_REG_IMR, 0) -- cgit v1.2.3 From a79922905a08559775468ba0a81659501cabcfea Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:49:05 +0200 Subject: staging: vt6655: Replace MACvIntDisable with VNSvOutPortD Replace macro MACvIntDisable with VNSvOutPortD and as it was only used twice, it can now be removed. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/937422bb879d8f1f58978bedc8d15559d28581c7.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- 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(-) (limited to 'drivers/staging/vt6655') 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) schedule_work(&priv->interrupt_work); - MACvIntDisable(priv->port_offset); + VNSvOutPortD(priv->port_offset + MAC_REG_IMR, 0); 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 = 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) -#define MACvIntDisable(iobase) \ - VNSvOutPortD(iobase + MAC_REG_IMR, 0) - #define MACvSelectPage0(iobase) \ iowrite8(0, iobase + MAC_REG_PAGE1SEL) -- cgit v1.2.3 From 6b2564abdf178a7f911a783561ac2865b6545298 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:49:10 +0200 Subject: staging: vt6655: Replace MACvSetCurrBCNTxDescAddr with VNSvOutPortD Replace macro MACvSetCurrBCNTxDescAddr with VNSvOutPortD and as it was only used twice, it can now be removed. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/1db079979f7e0e3535463d9f31204aa708c6f680.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- 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(-) (limited to 'drivers/staging/vt6655') 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); /* set MAC Beacon TX pointer */ - MACvSetCurrBCNTxDescAddr(priv->port_offset, - (priv->tx_beacon_dma)); + VNSvOutPortD(priv->port_offset + MAC_REG_BCNDMAPTR, priv->tx_beacon_dma); } /* 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) -/* 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, priv->wBCNBufLen = sizeof(*short_head) + skb->len; - MACvSetCurrBCNTxDescAddr(priv->port_offset, priv->tx_beacon_dma); + VNSvOutPortD(priv->port_offset + MAC_REG_BCNDMAPTR, priv->tx_beacon_dma); iowrite16(priv->wBCNBufLen, priv->port_offset + MAC_REG_BCNDMACTL + 2); /* Set auto Transmit on */ -- cgit v1.2.3 From dc59b9bdddecf92fba40a533f4dea8f46bd99b8b Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:49:15 +0200 Subject: staging: vt6655: Replace MACvRx0PerPktMode with VNSvOutPortD Replace macro MACvRx0PerPktMode with VNSvOutPortD and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/3da471693a65adb75a637805ee6d564ddafccdda.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/staging/vt6655') 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) } /* 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) -#define MACvRx0PerPktMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, RX_PERPKT) - #define MACvRx1PerPktMode(iobase) \ VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) -- cgit v1.2.3 From d371f5fd4f840fdc076a3573ad6361ee76f25c95 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:49:19 +0200 Subject: staging: vt6655: Replace MACvRx1PerPktMode with VNSvOutPortD Replace macro MACvRx1PerPktMode with VNSvOutPortD and as it was the only user, it can now be removed. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/9cb643b9554e33f5be7a2babefbed5eccca14625.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/staging/vt6655') 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) /* 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); 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) -#define MACvRx1PerPktMode(iobase) \ - VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, RX_PERPKT) - #define MACvReceive0(iobase) \ do { \ unsigned long dwData; \ -- cgit v1.2.3 From a18263ebc8250eea3e806dfa6e8fa8e85f76eba4 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:49:24 +0200 Subject: staging: vt6655: Replace VNSvOutPortD with iowrite32 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 Link: https://lore.kernel.org/r/03b6ff0250aa797f45a855ff2fc76f8013f73dc0.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- 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(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.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]); - VNSvOutPortD(iobase + MAC_REG_ITRTMSET, 0x23); + iowrite32(0x23, iobase + MAC_REG_ITRTMSET); MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0)); } priv->abyBBVGA[0] = 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 = 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 = 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); return true; @@ -411,7 +408,7 @@ void CARDvSafeResetTx(struct vnt_private *priv) MACvSetCurrTXDescAddr(TYPE_AC0DMA, priv, priv->td1_pool_dma); /* 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); } /* @@ -452,8 +449,8 @@ void CARDvSafeResetRx(struct vnt_private *priv) } /* 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); @@ -552,7 +549,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) /* swap over to get correct write order */ swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_1, phy.field_write); + iowrite32(phy.field_write, priv->port_offset + MAC_REG_RSPINF_B_1); /* RSPINF_b_2 */ vnt_get_phy_field(priv, 14, @@ -561,7 +558,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_2, phy.field_write); + iowrite32(phy.field_write, priv->port_offset + MAC_REG_RSPINF_B_2); /* RSPINF_b_5 */ vnt_get_phy_field(priv, 14, @@ -570,7 +567,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_5, phy.field_write); + iowrite32(phy.field_write, priv->port_offset + MAC_REG_RSPINF_B_5); /* RSPINF_b_11 */ vnt_get_phy_field(priv, 14, @@ -579,7 +576,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type) swap(phy.swap[0], phy.swap[1]); - VNSvOutPortD(priv->port_offset + MAC_REG_RSPINF_B_11, phy.field_write); + iowrite32(phy.field_write, priv->port_offset + MAC_REG_RSPINF_B_11); /* RSPINF_a_6 */ s_vCalculateOFDMRParameter(RATE_6M, @@ -798,8 +795,8 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, qwNextTBTT = 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); } @@ -824,8 +821,8 @@ void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF, qwTSF = 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); if (isr & ISR_FETALERR) { pr_debug(" ISR_FETALERR\n"); @@ -1134,7 +1134,7 @@ static void vnt_interrupt_work(struct work_struct *work) if (priv->vif) vnt_interrupt_process(priv); - VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE); + iowrite32(IMR_MASK_VALUE, priv->port_offset + MAC_REG_IMR); } static irqreturn_t vnt_interrupt(int irq, void *arg) @@ -1143,7 +1143,7 @@ static irqreturn_t vnt_interrupt(int irq, void *arg) schedule_work(&priv->interrupt_work); - VNSvOutPortD(priv->port_offset + MAC_REG_IMR, 0); + iowrite32(0, priv->port_offset + MAC_REG_IMR); return IRQ_HANDLED; } @@ -1253,7 +1253,7 @@ static int vnt_start(struct ieee80211_hw *hw) device_init_registers(priv); 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); ieee80211_wake_queues(hw); @@ -1522,20 +1522,16 @@ static void vnt_configure(struct ieee80211_hw *hw, if (priv->mc_list_count > 2) { MACvSelectPage1(priv->port_offset); - 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); MACvSelectPage0(priv->port_offset); } else { MACvSelectPage1(priv->port_offset); - 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); 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 = 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 = 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) #define MACvReceive1(iobase) \ @@ -604,9 +604,9 @@ do { \ unsigned long dwData; \ dwData = 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) #define MACvTransmit0(iobase) \ @@ -614,9 +614,9 @@ do { \ unsigned long dwData; \ dwData = 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) #define MACvTransmitAC0(iobase) \ @@ -624,9 +624,9 @@ do { \ unsigned long dwData; \ dwData = 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) #define MACvClearStckDS(iobase) \ @@ -648,7 +648,7 @@ do { \ unsigned long dwOrgValue; \ dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue = dwOrgValue | ENCFG_PROTECTMD; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ } while (0) #define MACvDisableProtectMD(iobase) \ @@ -656,7 +656,7 @@ do { \ unsigned long dwOrgValue; \ dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue = dwOrgValue & ~ENCFG_PROTECTMD; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ } while (0) #define MACvEnableBarkerPreambleMd(iobase) \ @@ -664,7 +664,7 @@ do { \ unsigned long dwOrgValue; \ dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue = dwOrgValue | ENCFG_BARKERPREAM; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ } while (0) #define MACvDisableBarkerPreambleMd(iobase) \ @@ -672,7 +672,7 @@ do { \ unsigned long dwOrgValue; \ dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue = dwOrgValue & ~ENCFG_BARKERPREAM; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ } while (0) #define MACvSetBBType(iobase, byTyp) \ @@ -681,7 +681,7 @@ do { \ dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ dwOrgValue = dwOrgValue & ~ENCFG_BBTYPE_MASK; \ dwOrgValue = dwOrgValue | (unsigned long)byTyp; \ - VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ + iowrite32((u32)dwOrgValue, iobase + MAC_REG_ENCFG); \ } while (0) #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, unsigned long dwData) unsigned short ww; unsigned long dwValue; - VNSvOutPortD(iobase + MAC_REG_IFREGCTL, dwData); + iowrite32((u32)dwData, iobase + MAC_REG_IFREGCTL); /* W_MAX_TIMEOUT is the timeout period */ for (ww = 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, priv->wBCNBufLen = sizeof(*short_head) + skb->len; - VNSvOutPortD(priv->port_offset + MAC_REG_BCNDMAPTR, priv->tx_beacon_dma); + iowrite32((u32)priv->tx_beacon_dma, priv->port_offset + MAC_REG_BCNDMAPTR); 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 @@ /* For memory mapped IO */ -#define VNSvOutPortD(dwIOAddress, dwData) \ - iowrite32((u32)(dwData), dwIOAddress) - /*--------------------- Export Classes ----------------------------*/ /*--------------------- Export Variables --------------------------*/ -- cgit v1.2.3 From 6f58936e1286c45cabf6abf5debf75664b532c2c Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:49:28 +0200 Subject: staging: vt6655: Add missing BE support on 2x iowrite32 Add missing big-endian support when using two times iowrite32 to write 64 Bit. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/974ef7a9244e7caeafd8c176c7b53a6de3c20219.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/card.c | 4 ++++ drivers/staging/vt6655/device_main.c | 1 + 2 files changed, 5 insertions(+) (limited to 'drivers/staging/vt6655') 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 = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp, local_tsf); /* adjust TSF, HW's TSF add TSF Offset reg */ + qwTSFOffset = 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 = wBeaconInterval; /* Set NextTBTT */ + qwNextTBTT = 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, qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); /* Set NextTBTT */ + qwNextTBTT = 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, qwTSF = CARDqGetNextTBTT(qwTSF, wBeaconInterval); /* Set NextTBTT */ + qwTSF = 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); + multicast = le64_to_cpu(multicast); iowrite32((u32)multicast, priv->port_offset + MAC_REG_MAR0); iowrite32((u32)(multicast >> 32), priv->port_offset + MAC_REG_MAR0 + 4); -- cgit v1.2.3 From f551dc6e7646204adf79b7a8e2db417c46b4fbe5 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 22 May 2022 21:49:33 +0200 Subject: staging: vt6655: Delete upc.h Delete upc.h as all macros have been removed from upc.h. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/b553095c618e7885af5c3e42f9b9b39d95127a44.1653203927.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- 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 (limited to 'drivers/staging/vt6655') 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__ -#include "upc.h" +#include "device.h" /*--------------------- 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 @@ * */ -#include "upc.h" +#include "device.h" #include "mac.h" #include "srom.h" 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__ */ -- cgit v1.2.3 From a0daad77a402f6d483d577649d49163fb622836b Mon Sep 17 00:00:00 2001 From: Nam Cao Date: Sun, 29 May 2022 18:02:11 +0200 Subject: staging: vt6655: Update function description The function vt6655_get_current_tsf has been updated while its description has not. Update the description to correctly reflect what it does. Signed-off-by: Nam Cao Link: https://lore.kernel.org/r/20220529160211.GA5805@nam-dell Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/card.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index abc74a5633c7..3380c7604e84 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -723,9 +723,9 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2) * In: * priv - The adapter to be read * Out: - * qwCurrTSF - Current TSF counter + * none * - * Return Value: true if success; otherwise false + * Return Value: Current TSF counter */ u64 vt6655_get_current_tsf(struct vnt_private *priv) { -- cgit v1.2.3 From 20cbfe17a486332e78bab01383cb2814f86d74ee Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Mon, 4 Jul 2022 20:20:27 +0200 Subject: staging: vt6655: Rename pbyEtherAddr to mac_addr Fix name of a variable in two macros that use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/fcc66446a04c1ecb3c2b66cdd47e932c231b1b9d.1656835310.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 102e575c965d..541c6ed6a62f 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -565,27 +565,27 @@ do { \ iowrite16(wData & ~(wBits), iobase + byRegOfs); \ } while (0) -#define MACvWriteBSSIDAddress(iobase, pbyEtherAddr) \ +#define MACvWriteBSSIDAddress(iobase, mac_addr) \ do { \ iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ - iowrite8(pbyEtherAddr[0], iobase + MAC_REG_BSSID0); \ - iowrite8(pbyEtherAddr[1], iobase + MAC_REG_BSSID0 + 1); \ - iowrite8(pbyEtherAddr[2], iobase + MAC_REG_BSSID0 + 2); \ - iowrite8(pbyEtherAddr[3], iobase + MAC_REG_BSSID0 + 3); \ - iowrite8(pbyEtherAddr[4], iobase + MAC_REG_BSSID0 + 4); \ - iowrite8(pbyEtherAddr[5], iobase + MAC_REG_BSSID0 + 5); \ + iowrite8(mac_addr[0], iobase + MAC_REG_BSSID0); \ + iowrite8(mac_addr[1], iobase + MAC_REG_BSSID0 + 1); \ + iowrite8(mac_addr[2], iobase + MAC_REG_BSSID0 + 2); \ + iowrite8(mac_addr[3], iobase + MAC_REG_BSSID0 + 3); \ + iowrite8(mac_addr[4], iobase + MAC_REG_BSSID0 + 4); \ + iowrite8(mac_addr[5], iobase + MAC_REG_BSSID0 + 5); \ iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ } while (0) -#define MACvReadEtherAddress(iobase, pbyEtherAddr) \ +#define MACvReadEtherAddress(iobase, mac_addr) \ do { \ iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ - pbyEtherAddr[0] = ioread8(iobase + MAC_REG_PAR0); \ - pbyEtherAddr[1] = ioread8(iobase + MAC_REG_PAR0 + 1); \ - pbyEtherAddr[2] = ioread8(iobase + MAC_REG_PAR0 + 2); \ - pbyEtherAddr[3] = ioread8(iobase + MAC_REG_PAR0 + 3); \ - pbyEtherAddr[4] = ioread8(iobase + MAC_REG_PAR0 + 4); \ - pbyEtherAddr[5] = ioread8(iobase + MAC_REG_PAR0 + 5); \ + mac_addr[0] = ioread8(iobase + MAC_REG_PAR0); \ + mac_addr[1] = ioread8(iobase + MAC_REG_PAR0 + 1); \ + mac_addr[2] = ioread8(iobase + MAC_REG_PAR0 + 2); \ + mac_addr[3] = ioread8(iobase + MAC_REG_PAR0 + 3); \ + mac_addr[4] = ioread8(iobase + MAC_REG_PAR0 + 4); \ + mac_addr[5] = ioread8(iobase + MAC_REG_PAR0 + 5); \ iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ } while (0) -- cgit v1.2.3 From 06f737ef8f5365dacb0e9f39f41a4fe32e92a79a Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Mon, 4 Jul 2022 20:20:35 +0200 Subject: staging: vt6655: Rename MACvWriteBSSIDAddress Fix name of a macro that uses CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/1190d93181409679f9ae348a95ea269b48b1115c.1656835310.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/mac.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 204994692c90..6cf21883d1fe 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1405,7 +1405,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, spin_lock_irqsave(&priv->lock, flags); - MACvWriteBSSIDAddress(priv->port_offset, conf->bssid); + vt6655_mac_write_bssid_addr(priv->port_offset, conf->bssid); spin_unlock_irqrestore(&priv->lock, flags); } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 541c6ed6a62f..cfebd126e42f 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -565,7 +565,7 @@ do { \ iowrite16(wData & ~(wBits), iobase + byRegOfs); \ } while (0) -#define MACvWriteBSSIDAddress(iobase, mac_addr) \ +#define vt6655_mac_write_bssid_addr(iobase, mac_addr) \ do { \ iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ iowrite8(mac_addr[0], iobase + MAC_REG_BSSID0); \ -- cgit v1.2.3 From 41c8e56baeca9075f84a6155e7423ffadc28197e Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Mon, 4 Jul 2022 20:20:39 +0200 Subject: staging: vt6655: Rename MACvReadEtherAddress Fix name of a macro that uses CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/3714f7cd3425e0ef0a3df0cc291131cdb85a3796.1656835310.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/mac.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 6cf21883d1fe..b9c57c661729 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1722,7 +1722,7 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) } /* initial to reload eeprom */ MACvInitialize(priv); - MACvReadEtherAddress(priv->port_offset, priv->abyCurrentNetAddr); + vt6655_mac_read_ether_addr(priv->port_offset, priv->abyCurrentNetAddr); /* Get RFType */ priv->byRFType = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_RFTYPE); diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index cfebd126e42f..ba5575d63db0 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -577,7 +577,7 @@ do { \ iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ } while (0) -#define MACvReadEtherAddress(iobase, mac_addr) \ +#define vt6655_mac_read_ether_addr(iobase, mac_addr) \ do { \ iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ mac_addr[0] = ioread8(iobase + MAC_REG_PAR0); \ -- cgit v1.2.3 From 52fbed10b8eaaab5e90ddf8c7270f532e43b0c00 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Mon, 4 Jul 2022 20:20:52 +0200 Subject: staging: vt6655: Move two macros to file where those are used Move two multiline macros to file of only useage to convert them later to static functions. checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/b4a04608b3900186d4941b3bfe9463bb79e261e8.1656835310.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 24 ++++++++++++++++++++++++ drivers/staging/vt6655/mac.h | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index b9c57c661729..fdb653071918 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -186,6 +186,30 @@ device_set_options(struct vnt_private *priv) pr_debug(" byBBType= %d\n", (int)priv->byBBType); } +#define vt6655_mac_write_bssid_addr(iobase, mac_addr) \ +do { \ + iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ + iowrite8(mac_addr[0], iobase + MAC_REG_BSSID0); \ + iowrite8(mac_addr[1], iobase + MAC_REG_BSSID0 + 1); \ + iowrite8(mac_addr[2], iobase + MAC_REG_BSSID0 + 2); \ + iowrite8(mac_addr[3], iobase + MAC_REG_BSSID0 + 3); \ + iowrite8(mac_addr[4], iobase + MAC_REG_BSSID0 + 4); \ + iowrite8(mac_addr[5], iobase + MAC_REG_BSSID0 + 5); \ + iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ +} while (0) + +#define vt6655_mac_read_ether_addr(iobase, mac_addr) \ +do { \ + iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ + mac_addr[0] = ioread8(iobase + MAC_REG_PAR0); \ + mac_addr[1] = ioread8(iobase + MAC_REG_PAR0 + 1); \ + mac_addr[2] = ioread8(iobase + MAC_REG_PAR0 + 2); \ + mac_addr[3] = ioread8(iobase + MAC_REG_PAR0 + 3); \ + mac_addr[4] = ioread8(iobase + MAC_REG_PAR0 + 4); \ + mac_addr[5] = ioread8(iobase + MAC_REG_PAR0 + 5); \ + iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ +} while (0) + /* * Initialisation of MAC & BBP registers */ diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index ba5575d63db0..5c14a76ed799 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -565,30 +565,6 @@ do { \ iowrite16(wData & ~(wBits), iobase + byRegOfs); \ } while (0) -#define vt6655_mac_write_bssid_addr(iobase, mac_addr) \ -do { \ - iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ - iowrite8(mac_addr[0], iobase + MAC_REG_BSSID0); \ - iowrite8(mac_addr[1], iobase + MAC_REG_BSSID0 + 1); \ - iowrite8(mac_addr[2], iobase + MAC_REG_BSSID0 + 2); \ - iowrite8(mac_addr[3], iobase + MAC_REG_BSSID0 + 3); \ - iowrite8(mac_addr[4], iobase + MAC_REG_BSSID0 + 4); \ - iowrite8(mac_addr[5], iobase + MAC_REG_BSSID0 + 5); \ - iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ -} while (0) - -#define vt6655_mac_read_ether_addr(iobase, mac_addr) \ -do { \ - iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ - mac_addr[0] = ioread8(iobase + MAC_REG_PAR0); \ - mac_addr[1] = ioread8(iobase + MAC_REG_PAR0 + 1); \ - mac_addr[2] = ioread8(iobase + MAC_REG_PAR0 + 2); \ - mac_addr[3] = ioread8(iobase + MAC_REG_PAR0 + 3); \ - mac_addr[4] = ioread8(iobase + MAC_REG_PAR0 + 4); \ - mac_addr[5] = ioread8(iobase + MAC_REG_PAR0 + 5); \ - iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ -} while (0) - #define MACvReceive0(iobase) \ do { \ unsigned long dwData; \ -- cgit v1.2.3 From 5df564ca11ce575b7378810faee2fc4c01149f9c Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Mon, 4 Jul 2022 20:20:57 +0200 Subject: staging: vt6655: Convert macro vt6655_mac_write_bssid_addr to function Convert macro vt6655_mac_write_bssid_addr to static function. checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/caecf7287d92c5d25ba0dfc16a24a6ce4aa67d55.1656835310.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index fdb653071918..025a53b493d3 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -122,6 +122,8 @@ static int vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent); static void device_free_info(struct vnt_private *priv); static void device_print_info(struct vnt_private *priv); +static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *mac_addr); + static int device_init_rd0_ring(struct vnt_private *priv); static int device_init_rd1_ring(struct vnt_private *priv); static int device_init_td0_ring(struct vnt_private *priv); @@ -186,17 +188,17 @@ device_set_options(struct vnt_private *priv) pr_debug(" byBBType= %d\n", (int)priv->byBBType); } -#define vt6655_mac_write_bssid_addr(iobase, mac_addr) \ -do { \ - iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ - iowrite8(mac_addr[0], iobase + MAC_REG_BSSID0); \ - iowrite8(mac_addr[1], iobase + MAC_REG_BSSID0 + 1); \ - iowrite8(mac_addr[2], iobase + MAC_REG_BSSID0 + 2); \ - iowrite8(mac_addr[3], iobase + MAC_REG_BSSID0 + 3); \ - iowrite8(mac_addr[4], iobase + MAC_REG_BSSID0 + 4); \ - iowrite8(mac_addr[5], iobase + MAC_REG_BSSID0 + 5); \ - iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ -} while (0) +static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *mac_addr) +{ + iowrite8(1, iobase + MAC_REG_PAGE1SEL); + iowrite8(mac_addr[0], iobase + MAC_REG_BSSID0); + iowrite8(mac_addr[1], iobase + MAC_REG_BSSID0 + 1); + iowrite8(mac_addr[2], iobase + MAC_REG_BSSID0 + 2); + iowrite8(mac_addr[3], iobase + MAC_REG_BSSID0 + 3); + iowrite8(mac_addr[4], iobase + MAC_REG_BSSID0 + 4); + iowrite8(mac_addr[5], iobase + MAC_REG_BSSID0 + 5); + iowrite8(0, iobase + MAC_REG_PAGE1SEL); +} #define vt6655_mac_read_ether_addr(iobase, mac_addr) \ do { \ -- cgit v1.2.3 From 7b5ec68ac1947929cc40e60d3748c1e6b6144682 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Mon, 4 Jul 2022 20:21:08 +0200 Subject: staging: vt6655: Convert macro vt6655_mac_read_ether_addr to function Convert macro vt6655_mac_read_ether_addr to static function. checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/2e2524187d9d3a6140fe4a5a35926db14dddfe98.1656835310.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 025a53b493d3..298963cbca1d 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -123,6 +123,7 @@ static void device_free_info(struct vnt_private *priv); static void device_print_info(struct vnt_private *priv); static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *mac_addr); +static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr); static int device_init_rd0_ring(struct vnt_private *priv); static int device_init_rd1_ring(struct vnt_private *priv); @@ -200,17 +201,17 @@ static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *mac_addr iowrite8(0, iobase + MAC_REG_PAGE1SEL); } -#define vt6655_mac_read_ether_addr(iobase, mac_addr) \ -do { \ - iowrite8(1, iobase + MAC_REG_PAGE1SEL); \ - mac_addr[0] = ioread8(iobase + MAC_REG_PAR0); \ - mac_addr[1] = ioread8(iobase + MAC_REG_PAR0 + 1); \ - mac_addr[2] = ioread8(iobase + MAC_REG_PAR0 + 2); \ - mac_addr[3] = ioread8(iobase + MAC_REG_PAR0 + 3); \ - mac_addr[4] = ioread8(iobase + MAC_REG_PAR0 + 4); \ - mac_addr[5] = ioread8(iobase + MAC_REG_PAR0 + 5); \ - iowrite8(0, iobase + MAC_REG_PAGE1SEL); \ -} while (0) +static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr) +{ + iowrite8(1, iobase + MAC_REG_PAGE1SEL); + mac_addr[0] = ioread8(iobase + MAC_REG_PAR0); + mac_addr[1] = ioread8(iobase + MAC_REG_PAR0 + 1); + mac_addr[2] = ioread8(iobase + MAC_REG_PAR0 + 2); + mac_addr[3] = ioread8(iobase + MAC_REG_PAR0 + 3); + mac_addr[4] = ioread8(iobase + MAC_REG_PAR0 + 4); + mac_addr[5] = ioread8(iobase + MAC_REG_PAR0 + 5); + iowrite8(0, iobase + MAC_REG_PAGE1SEL); +} /* * Initialisation of MAC & BBP registers -- cgit v1.2.3 From 385b35ab80b00444e94f30891a2468a7f284e4c7 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 6 Jul 2022 21:19:01 +0200 Subject: staging: vt6655: Use loop in vt6655_mac_write_bssid_addr Use loop in vt6655_mac_write_bssid_addr to avoid multiple similar statements. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/b3b93ae7ce41562565e9007eb4580b9c47a2881f.1657134099.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 298963cbca1d..099f0b95417a 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -192,12 +192,8 @@ device_set_options(struct vnt_private *priv) static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *mac_addr) { iowrite8(1, iobase + MAC_REG_PAGE1SEL); - iowrite8(mac_addr[0], iobase + MAC_REG_BSSID0); - iowrite8(mac_addr[1], iobase + MAC_REG_BSSID0 + 1); - iowrite8(mac_addr[2], iobase + MAC_REG_BSSID0 + 2); - iowrite8(mac_addr[3], iobase + MAC_REG_BSSID0 + 3); - iowrite8(mac_addr[4], iobase + MAC_REG_BSSID0 + 4); - iowrite8(mac_addr[5], iobase + MAC_REG_BSSID0 + 5); + for (int i = 0; i < 6; i++) + iowrite8(mac_addr[i], iobase + MAC_REG_BSSID0 + i); iowrite8(0, iobase + MAC_REG_PAGE1SEL); } -- cgit v1.2.3 From 2a1f94e45569b1cd9f002e65006f613c2a8360f2 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 6 Jul 2022 21:19:06 +0200 Subject: staging: vt6655: Use loop in vt6655_mac_read_ether_addr Use loop in vt6655_mac_read_ether_addr to avoid multiple similar statements. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/f233c8a007d75a8adcc99a07c582b75bdc1985db.1657134099.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/device_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 099f0b95417a..19840dddb4bf 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -200,12 +200,8 @@ static void vt6655_mac_write_bssid_addr(void __iomem *iobase, const u8 *mac_addr static void vt6655_mac_read_ether_addr(void __iomem *iobase, u8 *mac_addr) { iowrite8(1, iobase + MAC_REG_PAGE1SEL); - mac_addr[0] = ioread8(iobase + MAC_REG_PAR0); - mac_addr[1] = ioread8(iobase + MAC_REG_PAR0 + 1); - mac_addr[2] = ioread8(iobase + MAC_REG_PAR0 + 2); - mac_addr[3] = ioread8(iobase + MAC_REG_PAR0 + 3); - mac_addr[4] = ioread8(iobase + MAC_REG_PAR0 + 4); - mac_addr[5] = ioread8(iobase + MAC_REG_PAR0 + 5); + for (int i = 0; i < 6; i++) + mac_addr[i] = ioread8(iobase + MAC_REG_PAR0 + i); iowrite8(0, iobase + MAC_REG_PAGE1SEL); } -- cgit v1.2.3 From 186c46008c9d563facd247e2d97d00a044a5870e Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 06:58:56 +0200 Subject: staging: vt6655: Rename byRegOfs to reg_offset in four macros Fix name of a variable in four macros that use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/82f65d22ac8cd75b2c7790c13be3d0068968925b.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 5c14a76ed799..b3803143673c 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,32 +537,32 @@ /*--------------------- Export Macros ------------------------------*/ -#define MACvRegBitsOn(iobase, byRegOfs, byBits) \ +#define MACvRegBitsOn(iobase, reg_offset, byBits) \ do { \ unsigned char byData; \ - byData = ioread8(iobase + byRegOfs); \ - iowrite8(byData | (byBits), iobase + byRegOfs); \ + byData = ioread8(iobase + reg_offset); \ + iowrite8(byData | (byBits), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOn(iobase, byRegOfs, wBits) \ +#define MACvWordRegBitsOn(iobase, reg_offset, wBits) \ do { \ unsigned short wData; \ - wData = ioread16(iobase + byRegOfs); \ - iowrite16(wData | (wBits), iobase + byRegOfs); \ + wData = ioread16(iobase + reg_offset); \ + iowrite16(wData | (wBits), iobase + reg_offset); \ } while (0) -#define MACvRegBitsOff(iobase, byRegOfs, byBits) \ +#define MACvRegBitsOff(iobase, reg_offset, byBits) \ do { \ unsigned char byData; \ - byData = ioread8(iobase + byRegOfs); \ - iowrite8(byData & ~(byBits), iobase + byRegOfs); \ + byData = ioread8(iobase + reg_offset); \ + iowrite8(byData & ~(byBits), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOff(iobase, byRegOfs, wBits) \ +#define MACvWordRegBitsOff(iobase, reg_offset, wBits) \ do { \ unsigned short wData; \ - wData = ioread16(iobase + byRegOfs); \ - iowrite16(wData & ~(wBits), iobase + byRegOfs); \ + wData = ioread16(iobase + reg_offset); \ + iowrite16(wData & ~(wBits), iobase + reg_offset); \ } while (0) #define MACvReceive0(iobase) \ -- cgit v1.2.3 From 10ff399bf600d371929f0dc20148986aac03b872 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 06:59:18 +0200 Subject: staging: vt6655: Rename byBits to bit_mask in two macros Fix name of a variable in two macros that use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/5ac7e8860ecb23232cf5befea024872e7db76d59.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index b3803143673c..3037502c1883 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,11 +537,11 @@ /*--------------------- Export Macros ------------------------------*/ -#define MACvRegBitsOn(iobase, reg_offset, byBits) \ +#define MACvRegBitsOn(iobase, reg_offset, bit_mask) \ do { \ unsigned char byData; \ byData = ioread8(iobase + reg_offset); \ - iowrite8(byData | (byBits), iobase + reg_offset); \ + iowrite8(byData | (bit_mask), iobase + reg_offset); \ } while (0) #define MACvWordRegBitsOn(iobase, reg_offset, wBits) \ @@ -551,11 +551,11 @@ do { \ iowrite16(wData | (wBits), iobase + reg_offset); \ } while (0) -#define MACvRegBitsOff(iobase, reg_offset, byBits) \ +#define MACvRegBitsOff(iobase, reg_offset, bit_mask) \ do { \ unsigned char byData; \ byData = ioread8(iobase + reg_offset); \ - iowrite8(byData & ~(byBits), iobase + reg_offset); \ + iowrite8(byData & ~(bit_mask), iobase + reg_offset); \ } while (0) #define MACvWordRegBitsOff(iobase, reg_offset, wBits) \ -- cgit v1.2.3 From 5bd643b197ffbd039951a9475d8f887ec3f2beb6 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 06:59:38 +0200 Subject: staging: vt6655: Rename wBits to bit_mask in two macros Fix name of a variable in two macros that use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/8929407dc7355df515b7f9fdd195b45ff44f6b98.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3037502c1883..b8f543aef716 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -544,11 +544,11 @@ do { \ iowrite8(byData | (bit_mask), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOn(iobase, reg_offset, wBits) \ +#define MACvWordRegBitsOn(iobase, reg_offset, bit_mask) \ do { \ unsigned short wData; \ wData = ioread16(iobase + reg_offset); \ - iowrite16(wData | (wBits), iobase + reg_offset); \ + iowrite16(wData | (bit_mask), iobase + reg_offset); \ } while (0) #define MACvRegBitsOff(iobase, reg_offset, bit_mask) \ @@ -558,11 +558,11 @@ do { \ iowrite8(byData & ~(bit_mask), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOff(iobase, reg_offset, wBits) \ +#define MACvWordRegBitsOff(iobase, reg_offset, bit_mask) \ do { \ unsigned short wData; \ wData = ioread16(iobase + reg_offset); \ - iowrite16(wData & ~(wBits), iobase + reg_offset); \ + iowrite16(wData & ~(bit_mask), iobase + reg_offset); \ } while (0) #define MACvReceive0(iobase) \ -- cgit v1.2.3 From d57561d9609e0946ee2bcf9cafcce665095d0f91 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 06:59:58 +0200 Subject: staging: vt6655: Rename byData to reg_value in two macros Fix name of a variable in two macros that use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/159014866cce40913d360a0692fb3c426d4cb840.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index b8f543aef716..16c18a1ed22e 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -539,9 +539,9 @@ #define MACvRegBitsOn(iobase, reg_offset, bit_mask) \ do { \ - unsigned char byData; \ - byData = ioread8(iobase + reg_offset); \ - iowrite8(byData | (bit_mask), iobase + reg_offset); \ + unsigned char reg_value; \ + reg_value = ioread8(iobase + reg_offset); \ + iowrite8(reg_value | (bit_mask), iobase + reg_offset); \ } while (0) #define MACvWordRegBitsOn(iobase, reg_offset, bit_mask) \ @@ -553,9 +553,9 @@ do { \ #define MACvRegBitsOff(iobase, reg_offset, bit_mask) \ do { \ - unsigned char byData; \ - byData = ioread8(iobase + reg_offset); \ - iowrite8(byData & ~(bit_mask), iobase + reg_offset); \ + unsigned char reg_value; \ + reg_value = ioread8(iobase + reg_offset); \ + iowrite8(reg_value & ~(bit_mask), iobase + reg_offset); \ } while (0) #define MACvWordRegBitsOff(iobase, reg_offset, bit_mask) \ -- cgit v1.2.3 From ee9aded6d39a3d78eb832a5eef0bf31286332e03 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:00:12 +0200 Subject: staging: vt6655: Rename wData to reg_value in two macros Fix name of a variable in two macros that use CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/8f2e9451a24e380c997fcf7c87249f7ed9b66787.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 16c18a1ed22e..2a31c94156b2 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -546,9 +546,9 @@ do { \ #define MACvWordRegBitsOn(iobase, reg_offset, bit_mask) \ do { \ - unsigned short wData; \ - wData = ioread16(iobase + reg_offset); \ - iowrite16(wData | (bit_mask), iobase + reg_offset); \ + unsigned short reg_value; \ + reg_value = ioread16(iobase + reg_offset); \ + iowrite16(reg_value | (bit_mask), iobase + reg_offset); \ } while (0) #define MACvRegBitsOff(iobase, reg_offset, bit_mask) \ @@ -560,9 +560,9 @@ do { \ #define MACvWordRegBitsOff(iobase, reg_offset, bit_mask) \ do { \ - unsigned short wData; \ - wData = ioread16(iobase + reg_offset); \ - iowrite16(wData & ~(bit_mask), iobase + reg_offset); \ + unsigned short reg_value; \ + reg_value = ioread16(iobase + reg_offset); \ + iowrite16(reg_value & ~(bit_mask), iobase + reg_offset); \ } while (0) #define MACvReceive0(iobase) \ -- cgit v1.2.3 From 67ec557644db7643a4dd14c3068f01f5c729d62b Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:00:40 +0200 Subject: staging: vt6655: Rename MACvRegBitsOn Fix name of a macro that uses CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/7fb9627441ff97897d132c62d59676355b6d14ea.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/baseband.c | 8 ++++---- drivers/staging/vt6655/card.c | 14 ++++++-------- drivers/staging/vt6655/channel.c | 2 +- drivers/staging/vt6655/device_main.c | 9 ++++----- drivers/staging/vt6655/mac.h | 2 +- drivers/staging/vt6655/power.c | 15 +++++++-------- drivers/staging/vt6655/rxtx.c | 2 +- 7 files changed, 24 insertions(+), 28 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index a5412ca0ea68..5de841cb776c 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -1912,7 +1912,7 @@ bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr, iowrite8(by_bb_addr, iobase + MAC_REG_BBREGADR); /* turn on REGR */ - MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR); + vt6655_mac_reg_bits_on(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR); /* W_MAX_TIMEOUT is the timeout period */ for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { by_value = ioread8(iobase + MAC_REG_BBREGCTL); @@ -1957,7 +1957,7 @@ bool bb_write_embedded(struct vnt_private *priv, unsigned char by_bb_addr, iowrite8(by_data, iobase + MAC_REG_BBREGDATA); /* turn on BBREGCTL_REGW */ - MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW); + vt6655_mac_reg_bits_on(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW); /* W_MAX_TIMEOUT is the timeout period */ for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { by_value = ioread8(iobase + MAC_REG_BBREGCTL); @@ -2014,7 +2014,7 @@ bool bb_vt3253_init(struct vnt_private *priv) byVT3253B0_AGC4_RFMD2959[ii][1]); iowrite32(0x23, iobase + MAC_REG_ITRTMSET); - MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0)); + vt6655_mac_reg_bits_on(iobase, MAC_REG_PAPEDELAY, BIT(0)); } priv->abyBBVGA[0] = 0x18; priv->abyBBVGA[1] = 0x0A; @@ -2054,7 +2054,7 @@ bool bb_vt3253_init(struct vnt_private *priv) byVT3253B0_AGC[ii][1]); iowrite8(0x23, iobase + MAC_REG_ITRTMSET); - MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0)); + vt6655_mac_reg_bits_on(iobase, MAC_REG_PAPEDELAY, BIT(0)); priv->abyBBVGA[0] = 0x14; priv->abyBBVGA[1] = 0x0A; diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 3380c7604e84..220b47106855 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -296,8 +296,7 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate, qwTSFOffset = 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, - TFTCTL_TSFSYNCEN); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TSFSYNCEN); } return true; } @@ -331,7 +330,7 @@ bool CARDbSetBeaconPeriod(struct vnt_private *priv, qwNextTBTT = 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); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); return true; } @@ -374,8 +373,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv) priv->radio_off = true; pr_debug("chester power off\n"); - MACvRegBitsOn(priv->port_offset, MAC_REG_GPIOCTL0, - LED_ACTSET); /* LED issue */ + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_GPIOCTL0, LED_ACTSET); /* LED issue */ } void CARDvSafeResetTx(struct vnt_private *priv) @@ -734,7 +732,7 @@ u64 vt6655_get_current_tsf(struct vnt_private *priv) unsigned char data; u32 low, high; - MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); + vt6655_mac_reg_bits_on(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { data = ioread8(iobase + MAC_REG_TFTCTL); if (!(data & TFTCTL_TSFCNTRRD)) @@ -800,7 +798,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, qwNextTBTT = 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); + vt6655_mac_reg_bits_on(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); } /* @@ -827,6 +825,6 @@ void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF, qwTSF = 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); + vt6655_mac_reg_bits_on(iobase, MAC_REG_TFTCTL, TFTCTL_TBTTSYNCEN); pr_debug("Card:Update Next TBTT[%8llx]\n", qwTSF); } diff --git a/drivers/staging/vt6655/channel.c b/drivers/staging/vt6655/channel.c index 652dcaf61169..e926f9829a15 100644 --- a/drivers/staging/vt6655/channel.c +++ b/drivers/staging/vt6655/channel.c @@ -94,7 +94,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) } /* clear NAV */ - MACvRegBitsOn(priv->port_offset, MAC_REG_MACCR, MACCR_CLRNAV); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_MACCR, MACCR_CLRNAV); /* TX_PE will reserve 3 us for MAX2829 A mode only, * it is for better TX throughput diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 19840dddb4bf..1a202e5fa39f 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -417,7 +417,7 @@ static void device_init_registers(struct vnt_private *priv) CARDvSafeResetTx(priv); if (priv->local_id <= REV_ID_VT3253_A1) - MACvRegBitsOn(priv->port_offset, MAC_REG_RCR, RCR_WPAERR); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_RCR, RCR_WPAERR); /* Turn On Rx DMA */ MACvReceive0(priv->port_offset); @@ -1324,13 +1324,13 @@ static int vnt_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) case NL80211_IFTYPE_ADHOC: MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); - MACvRegBitsOn(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); break; case NL80211_IFTYPE_AP: MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); - MACvRegBitsOn(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); break; default: @@ -1476,8 +1476,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, if (conf->enable_beacon) { vnt_beacon_enable(priv, vif, conf); - MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, - TCR_AUTOBCNTX); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); } else { MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 2a31c94156b2..4e15174ca2ee 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,7 +537,7 @@ /*--------------------- Export Macros ------------------------------*/ -#define MACvRegBitsOn(iobase, reg_offset, bit_mask) \ +#define vt6655_mac_reg_bits_on(iobase, reg_offset, bit_mask) \ do { \ unsigned char reg_value; \ reg_value = ioread8(iobase + reg_offset); \ diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index 0bd2ddc61648..c8a456305e1d 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -59,23 +59,23 @@ void PSvEnablePowerSaving(struct vnt_private *priv, } /* Set AutoSleep */ - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); /* Set HWUTSF */ - MACvRegBitsOn(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); if (wListenInterval >= 2) { /* clear always listen beacon */ MACvRegBitsOff(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); /* first time set listen next beacon */ - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); } else { /* always listen beacon */ - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); } /* enable power saving hw function */ - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_PSEN); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_PSEN); priv->bEnablePSMode = true; priv->bPWBitOn = true; @@ -104,7 +104,7 @@ void PSvDisablePowerSaving(struct vnt_private *priv) MACvRegBitsOff(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); /* set always listen beacon */ - MACvRegBitsOn(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); priv->bEnablePSMode = false; @@ -135,8 +135,7 @@ bool PSbIsNextTBTTWakeUp(struct vnt_private *priv) if (priv->wake_up_count == 1) { /* Turn on wake up to listen next beacon */ - MACvRegBitsOn(priv->port_offset, - MAC_REG_PSCTL, PSCTL_LNBCN); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); wake_up = true; } } diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index 736681274296..537f54cf23c2 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -1424,7 +1424,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, iowrite16(priv->wBCNBufLen, priv->port_offset + MAC_REG_BCNDMACTL + 2); /* Set auto Transmit on */ - MACvRegBitsOn(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); + vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); /* Poll Transmit the adapter */ iowrite8(BEACON_READY, priv->port_offset + MAC_REG_BCNDMACTL); -- cgit v1.2.3 From ee67fe63b415caf0a367652399eae2e51bfe2e1a Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:00:25 +0200 Subject: staging: vt6655: Rename MACvWordRegBitsOn Fix name of a macro that uses CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/b3873e1103d642a804d42c945dc0c73d94b0c1cf.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/card.c | 4 ++-- drivers/staging/vt6655/device_main.c | 4 ++-- drivers/staging/vt6655/mac.h | 4 ++-- drivers/staging/vt6655/rf.c | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 220b47106855..54a12c97aa16 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -354,8 +354,8 @@ void CARDbRadioPowerOff(struct vnt_private *priv) case RF_RFMD2959: MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_TXPEINV); - MACvWordRegBitsOn(priv->port_offset, MAC_REG_SOFTPWRCTL, - SOFTPWRCTL_SWPE1); + vt6655_mac_word_reg_bits_on(priv->port_offset, MAC_REG_SOFTPWRCTL, + SOFTPWRCTL_SWPE1); break; case RF_AIROHA: diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 1a202e5fa39f..bcf35a89730e 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -359,8 +359,8 @@ static void device_init_registers(struct vnt_private *priv) } /* use relative tx timeout and 802.11i D4 */ - MACvWordRegBitsOn(priv->port_offset, - MAC_REG_CFG, (CFG_TKIPOPT | CFG_NOTXTIMEOUT)); + vt6655_mac_word_reg_bits_on(priv->port_offset, MAC_REG_CFG, + (CFG_TKIPOPT | CFG_NOTXTIMEOUT)); /* set performance parameter by registry */ MACvSetShortRetryLimit(priv, priv->byShortRetryLimit); diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 4e15174ca2ee..3303b9ba3bee 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -544,7 +544,7 @@ do { \ iowrite8(reg_value | (bit_mask), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOn(iobase, reg_offset, bit_mask) \ +#define vt6655_mac_word_reg_bits_on(iobase, reg_offset, bit_mask) \ do { \ unsigned short reg_value; \ reg_value = ioread16(iobase + reg_offset); \ @@ -661,7 +661,7 @@ do { \ } while (0) #define MACvSetRFLE_LatchBase(iobase) \ - MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) + vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) #define MAKEWORD(lb, hb) \ ((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8))) diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 99850367293a..6953afc0be34 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -209,8 +209,8 @@ static bool RFbAL2230Init(struct vnt_private *priv) /* 3-wire control for normal mode */ iowrite8(0, iobase + MAC_REG_SOFTPWRCTL); - MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI | - SOFTPWRCTL_TXPEINV)); + vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, + (SOFTPWRCTL_SWPECTI | SOFTPWRCTL_TXPEINV)); /* PLL Off */ MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); @@ -222,7 +222,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) MACvTimer0MicroSDelay(priv, 30); /* delay 30 us */ /* PLL On */ - MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); + vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); MACvTimer0MicroSDelay(priv, 150);/* 150us */ ret &= IFRFbWriteEmbedded(priv, (0x00d80f00 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW)); @@ -232,10 +232,10 @@ static bool RFbAL2230Init(struct vnt_private *priv) ret &= IFRFbWriteEmbedded(priv, al2230_init_table[CB_AL2230_INIT_SEQ - 1]); - MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3 | - SOFTPWRCTL_SWPE2 | - SOFTPWRCTL_SWPECTI | - SOFTPWRCTL_TXPEINV)); + vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3 | + SOFTPWRCTL_SWPE2 | + SOFTPWRCTL_SWPECTI | + SOFTPWRCTL_TXPEINV)); /* 3-wire control for power saving mode */ iowrite8(PSSIG_WPE3 | PSSIG_WPE2, iobase + MAC_REG_PSPWRSIG); -- cgit v1.2.3 From 5327d71d19556dda35343fc9dcb93d860ca92ebe Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:01:10 +0200 Subject: staging: vt6655: Rename MACvRegBitsOff Fix name of a macro that uses CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/e6bea6707f20a53d0631dd1f477ce72d36cd6f3e.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device_main.c | 24 ++++++++++++------------ drivers/staging/vt6655/mac.c | 10 +++++----- drivers/staging/vt6655/mac.h | 2 +- drivers/staging/vt6655/power.c | 6 +++--- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 54a12c97aa16..ec70a1f611d4 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -367,7 +367,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv) break; } - MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_RXON); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_RXON); bb_set_deep_sleep(priv, priv->local_id); diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index bcf35a89730e..92583ee8bffd 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -1322,13 +1322,13 @@ static int vnt_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) case NL80211_IFTYPE_STATION: break; case NL80211_IFTYPE_ADHOC: - MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); break; case NL80211_IFTYPE_AP: - MACvRegBitsOff(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_RCR, RCR_UNICAST); vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); @@ -1351,16 +1351,16 @@ static void vnt_remove_interface(struct ieee80211_hw *hw, case NL80211_IFTYPE_STATION: break; case NL80211_IFTYPE_ADHOC: - MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); - MACvRegBitsOff(priv->port_offset, - MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); - MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); + vt6655_mac_reg_bits_off(priv->port_offset, + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_ADHOC); break; case NL80211_IFTYPE_AP: - MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); - MACvRegBitsOff(priv->port_offset, - MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); - MACvRegBitsOff(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); + vt6655_mac_reg_bits_off(priv->port_offset, + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_HOSTCR, HOSTCR_AP); break; default: break; @@ -1478,8 +1478,8 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_TCR, TCR_AUTOBCNTX); } else { - MACvRegBitsOff(priv->port_offset, MAC_REG_TCR, - TCR_AUTOBCNTX); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_TCR, + TCR_AUTOBCNTX); } } diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 8e789ce055cd..688f7c685c97 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -337,7 +337,7 @@ bool MACbSafeRxOff(struct vnt_private *priv) } /* try to safe shutdown RX */ - MACvRegBitsOff(io_base, MAC_REG_HOSTCR, HOSTCR_RXON); + vt6655_mac_reg_bits_off(io_base, MAC_REG_HOSTCR, HOSTCR_RXON); /* W_MAX_TIMEOUT is the timeout period */ for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { if (!(ioread8(io_base + MAC_REG_HOSTCR) & HOSTCR_RXONST)) @@ -392,7 +392,7 @@ bool MACbSafeTxOff(struct vnt_private *priv) } /* try to safe shutdown TX */ - MACvRegBitsOff(io_base, MAC_REG_HOSTCR, HOSTCR_TXON); + vt6655_mac_reg_bits_off(io_base, MAC_REG_HOSTCR, HOSTCR_TXON); /* W_MAX_TIMEOUT is the timeout period */ for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { @@ -423,7 +423,7 @@ bool MACbSafeStop(struct vnt_private *priv) { void __iomem *io_base = priv->port_offset; - MACvRegBitsOff(io_base, MAC_REG_TCR, TCR_AUTOBCNTX); + vt6655_mac_reg_bits_off(io_base, MAC_REG_TCR, TCR_AUTOBCNTX); if (!MACbSafeRxOff(priv)) { pr_debug(" MACbSafeRxOff == false)\n"); @@ -436,7 +436,7 @@ bool MACbSafeStop(struct vnt_private *priv) return false; } - MACvRegBitsOff(io_base, MAC_REG_HOSTCR, HOSTCR_MACEN); + vt6655_mac_reg_bits_off(io_base, MAC_REG_HOSTCR, HOSTCR_MACEN); return true; } @@ -730,7 +730,7 @@ bool MACbPSWakeup(struct vnt_private *priv) return true; /* Disable PS */ - MACvRegBitsOff(io_base, MAC_REG_PSCTL, PSCTL_PSEN); + vt6655_mac_reg_bits_off(io_base, MAC_REG_PSCTL, PSCTL_PSEN); /* Check if SyncFlushOK */ for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3303b9ba3bee..16f2b77e1371 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -551,7 +551,7 @@ do { \ iowrite16(reg_value | (bit_mask), iobase + reg_offset); \ } while (0) -#define MACvRegBitsOff(iobase, reg_offset, bit_mask) \ +#define vt6655_mac_reg_bits_off(iobase, reg_offset, bit_mask) \ do { \ unsigned char reg_value; \ reg_value = ioread8(iobase + reg_offset); \ diff --git a/drivers/staging/vt6655/power.c b/drivers/staging/vt6655/power.c index c8a456305e1d..8527ad3eff48 100644 --- a/drivers/staging/vt6655/power.c +++ b/drivers/staging/vt6655/power.c @@ -66,7 +66,7 @@ void PSvEnablePowerSaving(struct vnt_private *priv, if (wListenInterval >= 2) { /* clear always listen beacon */ - MACvRegBitsOff(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); /* first time set listen next beacon */ vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_LNBCN); } else { @@ -98,10 +98,10 @@ void PSvDisablePowerSaving(struct vnt_private *priv) MACbPSWakeup(priv); /* clear AutoSleep */ - MACvRegBitsOff(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_PSCFG, PSCFG_AUTOSLEEP); /* clear HWUTSF */ - MACvRegBitsOff(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); + vt6655_mac_reg_bits_off(priv->port_offset, MAC_REG_TFTCTL, TFTCTL_HWUTSF); /* set always listen beacon */ vt6655_mac_reg_bits_on(priv->port_offset, MAC_REG_PSCTL, PSCTL_ALBCN); -- cgit v1.2.3 From 28d4e692874cf3f730c5c28fc8a130b2faa6fbcb Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:00:57 +0200 Subject: staging: vt6655: Rename MACvWordRegBitsOff Fix name of a macro that uses CamelCase which is not accepted by checkpatch.pl Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/b8d4b72ddfdefb6b8a73fb95f6851e0f365118ba.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/card.c | 12 ++++++------ drivers/staging/vt6655/mac.h | 2 +- drivers/staging/vt6655/rf.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index ec70a1f611d4..846469cc06bb 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -352,18 +352,18 @@ void CARDbRadioPowerOff(struct vnt_private *priv) switch (priv->byRFType) { case RF_RFMD2959: - MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, - SOFTPWRCTL_TXPEINV); + vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL, + SOFTPWRCTL_TXPEINV); vt6655_mac_word_reg_bits_on(priv->port_offset, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE1); break; case RF_AIROHA: case RF_AL2230S: - MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, - SOFTPWRCTL_SWPE2); - MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL, - SOFTPWRCTL_SWPE3); + vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL, + SOFTPWRCTL_SWPE2); + vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL, + SOFTPWRCTL_SWPE3); break; } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 16f2b77e1371..4d328b724559 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -558,7 +558,7 @@ do { \ iowrite8(reg_value & ~(bit_mask), iobase + reg_offset); \ } while (0) -#define MACvWordRegBitsOff(iobase, reg_offset, bit_mask) \ +#define vt6655_mac_word_reg_bits_off(iobase, reg_offset, bit_mask) \ do { \ unsigned short reg_value; \ reg_value = ioread16(iobase + reg_offset); \ diff --git a/drivers/staging/vt6655/rf.c b/drivers/staging/vt6655/rf.c index 6953afc0be34..1fadc2fc4412 100644 --- a/drivers/staging/vt6655/rf.c +++ b/drivers/staging/vt6655/rf.c @@ -212,7 +212,7 @@ static bool RFbAL2230Init(struct vnt_private *priv) vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPECTI | SOFTPWRCTL_TXPEINV)); /* PLL Off */ - MACvWordRegBitsOff(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); + vt6655_mac_word_reg_bits_off(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPE3); /* patch abnormal AL2230 frequency output */ IFRFbWriteEmbedded(priv, (0x07168700 + (BY_AL2230_REG_LEN << 3) + IFREGCTL_REGW)); -- cgit v1.2.3 From 1b225449151fd01fa83ca144996509e2f936a8a2 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:01:26 +0200 Subject: staging: vt6655: Convert macro vt6655_mac_reg_bits_on to function Convert macro vt6655_mac_reg_bits_on to function. checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/6b23869ec13b35359b135f005a81f3ed50e5801e.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.c | 8 ++++++++ drivers/staging/vt6655/mac.h | 8 +------- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 688f7c685c97..902034a28c6c 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -38,6 +38,14 @@ #include "mac.h" +void vt6655_mac_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask) +{ + unsigned char reg_value; + + reg_value = ioread8(iobase + reg_offset); + iowrite8(reg_value | bit_mask, iobase + reg_offset); +} + /* * Description: * Test if all test bits off diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 4d328b724559..031316d42dba 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,13 +537,6 @@ /*--------------------- Export Macros ------------------------------*/ -#define vt6655_mac_reg_bits_on(iobase, reg_offset, bit_mask) \ -do { \ - unsigned char reg_value; \ - reg_value = ioread8(iobase + reg_offset); \ - iowrite8(reg_value | (bit_mask), iobase + reg_offset); \ -} while (0) - #define vt6655_mac_word_reg_bits_on(iobase, reg_offset, bit_mask) \ do { \ unsigned short reg_value; \ @@ -666,6 +659,7 @@ do { \ #define MAKEWORD(lb, hb) \ ((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8))) +void vt6655_mac_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask); bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs, unsigned char byTestBits); -- cgit v1.2.3 From 77072b0f4b5559a7e649b49aebdc71b1b083bf98 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:01:37 +0200 Subject: staging: vt6655: Convert macro vt6655_mac_word_reg_bits_on to function Convert macro vt6655_mac_word_reg_bits_on to function. checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/255c7f5a5e98a399aa4e299e7cf567016bd86d60.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.c | 8 ++++++++ drivers/staging/vt6655/mac.h | 8 +------- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 902034a28c6c..076e1bfff3e0 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -46,6 +46,14 @@ void vt6655_mac_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u8 iowrite8(reg_value | bit_mask, iobase + reg_offset); } +void vt6655_mac_word_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u16 bit_mask) +{ + unsigned short reg_value; + + reg_value = ioread16(iobase + reg_offset); + iowrite16(reg_value | (bit_mask), iobase + reg_offset); +} + /* * Description: * Test if all test bits off diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 031316d42dba..3b23334db538 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,13 +537,6 @@ /*--------------------- Export Macros ------------------------------*/ -#define vt6655_mac_word_reg_bits_on(iobase, reg_offset, bit_mask) \ -do { \ - unsigned short reg_value; \ - reg_value = ioread16(iobase + reg_offset); \ - iowrite16(reg_value | (bit_mask), iobase + reg_offset); \ -} while (0) - #define vt6655_mac_reg_bits_off(iobase, reg_offset, bit_mask) \ do { \ unsigned char reg_value; \ @@ -660,6 +653,7 @@ do { \ ((unsigned short)(((unsigned char)(lb)) | (((unsigned short)((unsigned char)(hb))) << 8))) void vt6655_mac_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask); +void vt6655_mac_word_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u16 bit_mask); bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs, unsigned char byTestBits); -- cgit v1.2.3 From 64a5c7bf563b3825b2c46d8a8c69a1c6c4029d2d Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:02:03 +0200 Subject: staging: vt6655: Convert macro vt6655_mac_reg_bits_off to function Convert macro vt6655_mac_reg_bits_off to function. checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/422950c8e1349fba2f97b0b95ba13f361cde05d9.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.c | 8 ++++++++ drivers/staging/vt6655/mac.h | 8 +------- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 076e1bfff3e0..aa9684229dfe 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -54,6 +54,14 @@ void vt6655_mac_word_reg_bits_on(void __iomem *iobase, const u8 reg_offset, cons iowrite16(reg_value | (bit_mask), iobase + reg_offset); } +void vt6655_mac_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask) +{ + unsigned char reg_value; + + reg_value = ioread8(iobase + reg_offset); + iowrite8(reg_value & ~(bit_mask), iobase + reg_offset); +} + /* * Description: * Test if all test bits off diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 3b23334db538..e7b648cf2024 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,13 +537,6 @@ /*--------------------- Export Macros ------------------------------*/ -#define vt6655_mac_reg_bits_off(iobase, reg_offset, bit_mask) \ -do { \ - unsigned char reg_value; \ - reg_value = ioread8(iobase + reg_offset); \ - iowrite8(reg_value & ~(bit_mask), iobase + reg_offset); \ -} while (0) - #define vt6655_mac_word_reg_bits_off(iobase, reg_offset, bit_mask) \ do { \ unsigned short reg_value; \ @@ -654,6 +647,7 @@ do { \ void vt6655_mac_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask); void vt6655_mac_word_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u16 bit_mask); +void vt6655_mac_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask); bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs, unsigned char byTestBits); -- cgit v1.2.3 From 8af028c2b22bc04f5ab59cd39fa97ccf14aa8f25 Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Wed, 13 Jul 2022 07:02:14 +0200 Subject: staging: vt6655: Convert macro vt6655_mac_word_reg_bits_off to function Convert macro vt6655_mac_word_reg_bits_off to function. checkpatch.pl does not accept multiline macros. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/04fb37871c4d383c27287934a0dddb3aa7974b08.1657657918.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.c | 8 ++++++++ drivers/staging/vt6655/mac.h | 9 ++------- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index aa9684229dfe..a7f645f9ccf8 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -62,6 +62,14 @@ void vt6655_mac_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u8 iowrite8(reg_value & ~(bit_mask), iobase + reg_offset); } +void vt6655_mac_word_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u16 bit_mask) +{ + unsigned short reg_value; + + reg_value = ioread16(iobase + reg_offset); + iowrite16(reg_value & ~(bit_mask), iobase + reg_offset); +} + /* * Description: * Test if all test bits off diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index e7b648cf2024..b307161818a0 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,13 +537,6 @@ /*--------------------- Export Macros ------------------------------*/ -#define vt6655_mac_word_reg_bits_off(iobase, reg_offset, bit_mask) \ -do { \ - unsigned short reg_value; \ - reg_value = ioread16(iobase + reg_offset); \ - iowrite16(reg_value & ~(bit_mask), iobase + reg_offset); \ -} while (0) - #define MACvReceive0(iobase) \ do { \ unsigned long dwData; \ @@ -648,6 +641,8 @@ do { \ void vt6655_mac_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask); void vt6655_mac_word_reg_bits_on(void __iomem *iobase, const u8 reg_offset, const u16 bit_mask); void vt6655_mac_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u8 bit_mask); +void vt6655_mac_word_reg_bits_off(void __iomem *iobase, const u8 reg_offset, const u16 bit_mask); + bool MACbIsRegBitsOff(struct vnt_private *priv, unsigned char byRegOfs, unsigned char byTestBits); -- cgit v1.2.3 From 899336721928914bfbda515457706616bf2e676d Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Thu, 28 Jul 2022 07:59:32 +0200 Subject: staging: vt6655: Rename MACvClearStckDS Rename MACvClearStckDS macro to vt6655_mac_clear_stck_ds to avoid CamelCase which is not accepted by checkpatch.pl and to clean up namespace. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/8ba4413d52e95406393755f48da065511b891f03.1658986804.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.c | 2 +- drivers/staging/vt6655/mac.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index a7f645f9ccf8..d7ee42df7062 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -518,7 +518,7 @@ void MACvInitialize(struct vnt_private *priv) { void __iomem *io_base = priv->port_offset; /* clear sticky bits */ - MACvClearStckDS(io_base); + vt6655_mac_clear_stck_ds(io_base); /* disable force PME-enable */ iowrite8(PME_OVR, io_base + MAC_REG_PMC1); /* only 3253 A */ diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index b307161818a0..fc587244a70d 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -577,7 +577,7 @@ do { \ iowrite32(DMACTL_RUN, iobase + MAC_REG_AC0DMACTL); \ } while (0) -#define MACvClearStckDS(iobase) \ +#define vt6655_mac_clear_stck_ds(iobase) \ do { \ unsigned char byOrgValue; \ byOrgValue = ioread8(iobase + MAC_REG_STICKHW); \ -- cgit v1.2.3 From c528bbb7dc062c707f6064eec1bccafb8490758f Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Thu, 28 Jul 2022 07:59:45 +0200 Subject: staging: vt6655: Convert macro vt6655_mac_clear_stck_ds to function Convert once used macro to static function. Multiline macros are not liked by kernel community. Rename variable byOrgValue to reg_value to avoid CamelCase which is not accepted by checkpatch.pl. Change variable declaration to u8 as this improves readability. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/cbfe5cc170b68564ff45bb7f45c63de241c2a664.1658986804.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.c | 9 +++++++++ drivers/staging/vt6655/mac.h | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'drivers/staging/vt6655') diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index d7ee42df7062..dcc649532737 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -70,6 +70,15 @@ void vt6655_mac_word_reg_bits_off(void __iomem *iobase, const u8 reg_offset, con iowrite16(reg_value & ~(bit_mask), iobase + reg_offset); } +static void vt6655_mac_clear_stck_ds(void __iomem *iobase) +{ + u8 reg_value; + + reg_value = ioread8(iobase + MAC_REG_STICKHW); + reg_value = reg_value & 0xFC; + iowrite8(reg_value, iobase + MAC_REG_STICKHW); +} + /* * Description: * Test if all test bits off diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index fc587244a70d..0122c4603c66 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -577,14 +577,6 @@ do { \ iowrite32(DMACTL_RUN, iobase + MAC_REG_AC0DMACTL); \ } while (0) -#define vt6655_mac_clear_stck_ds(iobase) \ -do { \ - unsigned char byOrgValue; \ - byOrgValue = ioread8(iobase + MAC_REG_STICKHW); \ - byOrgValue = byOrgValue & 0xFC; \ - iowrite8(byOrgValue, iobase + MAC_REG_STICKHW); \ -} while (0) - #define MACvSelectPage0(iobase) \ iowrite8(0, iobase + MAC_REG_PAGE1SEL) -- cgit v1.2.3