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

staging: vt6655: Rename MACvWordRegBitsOff

parent 5327d71d
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ void CARDbRadioPowerOff(struct vnt_private *priv)

	switch (priv->byRFType) {
	case RF_RFMD2959:
		MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL,
		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);
@@ -360,9 +360,9 @@ void CARDbRadioPowerOff(struct vnt_private *priv)

	case RF_AIROHA:
	case RF_AL2230S:
		MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL,
		vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL,
					     SOFTPWRCTL_SWPE2);
		MACvWordRegBitsOff(priv->port_offset, MAC_REG_SOFTPWRCTL,
		vt6655_mac_word_reg_bits_off(priv->port_offset, MAC_REG_SOFTPWRCTL,
					     SOFTPWRCTL_SWPE3);
		break;
	}
+1 −1
Original line number Diff line number Diff line
@@ -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);			\
+1 −1
Original line number Diff line number Diff line
@@ -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));