Commit a9bed1df authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rename MACvRegBitsOff to vnt_mac_reg_bits_off 



Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a7a93e32

drivers/staging/vt6656/card.c

+3 −3
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void vnt_set_channel(struct vnt_private *priv, u32 connection_channel) 
	MACvRegBitsOn(priv, MAC_REG_MACCR, MACCR_CLRNAV);



	/* Set Channel[7] = 0 to tell H/W channel is changing now. */

	MACvRegBitsOff(priv, MAC_REG_CHANNEL, 0xb0);

	vnt_mac_reg_bits_off(priv, MAC_REG_CHANNEL, 0xb0);



	vnt_control_out(priv, MESSAGE_TYPE_SELECT_CHANNLE,

					connection_channel, 0, 0, NULL);
@@ -777,12 +777,12 @@ int vnt_radio_power_off(struct vnt_private *priv) 
	case RF_VT3226:

	case RF_VT3226D0:

	case RF_VT3342A0:

		MACvRegBitsOff(priv, MAC_REG_SOFTPWRCTL,

		vnt_mac_reg_bits_off(priv, MAC_REG_SOFTPWRCTL,

				(SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));

		break;

	}



	MACvRegBitsOff(priv, MAC_REG_HOSTCR, HOSTCR_RXON);

	vnt_mac_reg_bits_off(priv, MAC_REG_HOSTCR, HOSTCR_RXON);



	BBvSetDeepSleep(priv);

drivers/staging/vt6656/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void vnt_mac_set_keyentry(struct vnt_private *priv, u16 key_ctl, u32 entry_idx, 
		(u16)key_idx, sizeof(struct vnt_mac_set_key), (u8 *)&set_key);

}



void MACvRegBitsOff(struct vnt_private *priv, u8 reg_ofs, u8 bits)

void vnt_mac_reg_bits_off(struct vnt_private *priv, u8 reg_ofs, u8 bits)

{

	u8 data[2];

drivers/staging/vt6656/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ void vnt_mac_shutdown(struct vnt_private *); 
void vnt_mac_set_bb_type(struct vnt_private *, u8);

void vnt_mac_disable_keyentry(struct vnt_private *, u8);

void vnt_mac_set_keyentry(struct vnt_private *, u16, u32, u32, u8 *, u8 *);

void MACvRegBitsOff(struct vnt_private *, u8, u8);

void vnt_mac_reg_bits_off(struct vnt_private *, u8, u8);

void MACvRegBitsOn(struct vnt_private *, u8, u8);

void MACvWriteWord(struct vnt_private *, u8, u16);

void MACvWriteBSSIDAddress(struct vnt_private *, u8 *);

drivers/staging/vt6656/main_usb.c

+2 −1
Original line number Diff line number Diff line
@@ -546,7 +546,8 @@ static int device_init_registers(struct vnt_private *pDevice) 
			pDevice->bHWRadioOff = true;

			MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);

		} else {

			MACvRegBitsOff(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);

			vnt_mac_reg_bits_off(pDevice, MAC_REG_GPIOCTL1,

								GPIO3_INTMD);

			pDevice->bHWRadioOff = false;

		}

drivers/staging/vt6656/power.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void PSvEnablePowerSaving(struct vnt_private *pDevice, u16 wListenInterval) 
	if (wListenInterval >= 2) {



		/* clear always listen beacon */

		MACvRegBitsOff(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);

		vnt_mac_reg_bits_off(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);



		/* first time set listen next beacon */

		MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_LNBCN);
@@ -133,7 +133,7 @@ void PSvDisablePowerSaving(struct vnt_private *pDevice) 
						0, 0, NULL);



	/* clear AutoSleep */

	MACvRegBitsOff(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);

	vnt_mac_reg_bits_off(pDevice, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);



	/* set always listen beacon */

	MACvRegBitsOn(pDevice, MAC_REG_PSCTL, PSCTL_ALBCN);