leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6655: Rename macro MACvSelectPage1

Browse Source 
Rename MACvSelectPage1 macro to VT6655_MAC_SELECT_PAGE1 to avoid
CamelCase which is not accepted by checkpatch.pl and to clean up
namespace. Remove unnecessary line break.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/8aa03e089613d49be7acedcb60a19a0133e96baa.1661666677.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Philipp Hortmann
2022-08-28 08:54:04 +02:00
committed by Greg Kroah-Hartman
parent 54765727cf
commit 8809cc889e
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/vt6655/card.c
View File

@@ -545,7 +545,7 @@ void CARDvSetRSPINF(struct vnt_private *priv, u8 bb_type)
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
/* Set to Page1 */ /* Set to Page1 */
MACvSelectPage1(priv->port_offset); VT6655_MAC_SELECT_PAGE1(priv->port_offset);
/* RSPINF_b_1 */ /* RSPINF_b_1 */
vnt_get_phy_field(priv, 14, vnt_get_phy_field(priv, 14,

2
drivers/staging/vt6655/channel.c
View File

@@ -116,7 +116,7 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
/* set HW default power register */ /* set HW default power register */
MACvSelectPage1(priv->port_offset); VT6655_MAC_SELECT_PAGE1(priv->port_offset);
RFbSetPower(priv, RATE_1M, priv->byCurrentCh); RFbSetPower(priv, RATE_1M, priv->byCurrentCh);
iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK); iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK);
RFbSetPower(priv, RATE_6M, priv->byCurrentCh); RFbSetPower(priv, RATE_6M, priv->byCurrentCh);

6
drivers/staging/vt6655/device_main.c
View File

@@ -400,7 +400,7 @@ static void device_init_registers(struct vnt_private *priv)
} }
if (priv->local_id > REV_ID_VT3253_B1) { if (priv->local_id > REV_ID_VT3253_B1) {
MACvSelectPage1(priv->port_offset); VT6655_MAC_SELECT_PAGE1(priv->port_offset);
iowrite8(MSRCTL1_TXPWR | MSRCTL1_CSAPAREN, priv->port_offset + MAC_REG_MSRCTL + 1); iowrite8(MSRCTL1_TXPWR | MSRCTL1_CSAPAREN, priv->port_offset + MAC_REG_MSRCTL + 1);
@@ -1587,14 +1587,14 @@ static void vnt_configure(struct ieee80211_hw *hw,
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (priv->mc_list_count > 2) { if (priv->mc_list_count > 2) {
MACvSelectPage1(priv->port_offset); VT6655_MAC_SELECT_PAGE1(priv->port_offset);
iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0); iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0);
iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0 + 4); iowrite32(0xffffffff, priv->port_offset + MAC_REG_MAR0 + 4);
VT6655_MAC_SELECT_PAGE0(priv->port_offset); VT6655_MAC_SELECT_PAGE0(priv->port_offset);
} else { } else {
MACvSelectPage1(priv->port_offset); VT6655_MAC_SELECT_PAGE1(priv->port_offset);
multicast = le64_to_cpu(multicast); multicast = le64_to_cpu(multicast);
iowrite32((u32)multicast, priv->port_offset + MAC_REG_MAR0); iowrite32((u32)multicast, priv->port_offset + MAC_REG_MAR0);

4
drivers/staging/vt6655/mac.c
View File

@@ -213,7 +213,7 @@ void MACvSaveContext(struct vnt_private *priv, unsigned char *cxt_buf)
/* read page0 register */ /* read page0 register */
memcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0); memcpy_fromio(cxt_buf, io_base, MAC_MAX_CONTEXT_SIZE_PAGE0);
MACvSelectPage1(io_base); VT6655_MAC_SELECT_PAGE1(io_base);
/* read page1 register */ /* read page1 register */
memcpy_fromio(cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, io_base, memcpy_fromio(cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, io_base,
@@ -240,7 +240,7 @@ void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf)
{ {
void __iomem *io_base = priv->port_offset; void __iomem *io_base = priv->port_offset;
MACvSelectPage1(io_base); VT6655_MAC_SELECT_PAGE1(io_base);
/* restore page1 */ /* restore page1 */
memcpy_toio(io_base, cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0, memcpy_toio(io_base, cxt_buf + MAC_MAX_CONTEXT_SIZE_PAGE0,
MAC_MAX_CONTEXT_SIZE_PAGE1); MAC_MAX_CONTEXT_SIZE_PAGE1);

3
drivers/staging/vt6655/mac.h
View File

@@ -539,8 +539,7 @@
#define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, iobase + MAC_REG_PAGE1SEL) #define VT6655_MAC_SELECT_PAGE0(iobase) iowrite8(0, iobase + MAC_REG_PAGE1SEL)
#define MACvSelectPage1(iobase) \ #define VT6655_MAC_SELECT_PAGE1(iobase) iowrite8(1, iobase + MAC_REG_PAGE1SEL)
iowrite8(1, iobase + MAC_REG_PAGE1SEL)
#define MACvSetRFLE_LatchBase(iobase) \ #define MACvSetRFLE_LatchBase(iobase) \
vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT) vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)