Commit ee67fe63 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Rename MACvWordRegBitsOn 



Fix name of a macro that uses CamelCase which is not
accepted by checkpatch.pl

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/b3873e1103d642a804d42c945dc0c73d94b0c1cf.1657657918.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67ec5576

drivers/staging/vt6655/card.c

+2 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ 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,

		vt6655_mac_word_reg_bits_on(priv->port_offset, MAC_REG_SOFTPWRCTL,

					    SOFTPWRCTL_SWPE1);

		break;

drivers/staging/vt6655/device_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/vt6655/mac.h

+2 −2
Original line number Diff line number Diff line
@@ -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)))

drivers/staging/vt6655/rf.c

+7 −7
Original line number Diff line number Diff line
@@ -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,7 +232,7 @@ 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    |

	vt6655_mac_word_reg_bits_on(iobase, MAC_REG_SOFTPWRCTL, (SOFTPWRCTL_SWPE3    |

								 SOFTPWRCTL_SWPE2    |

								 SOFTPWRCTL_SWPECTI  |

								 SOFTPWRCTL_TXPEINV));