Commit a5efd7bd authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: remove constant function parameter 



The rtl88eu_pwrseqcmdparsing function takes a parameter to restrict
commands to certain power cut versions of the rtl8188eu chipset.
This mechanism is not used, the callers always select all versions.

Remove the power cut parameter.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210718173610.894-8-martin@kaiser.cx


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

drivers/staging/rtl8188eu/hal/pwrseqcmd.c

+38 −44
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ 
/* This routine deals with the Power Configuration CMDs parsing

 * for RTL8723/RTL8188E Series IC.

 */

u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers,

			    struct wl_pwr_cfg pwrseqcmd[])

u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, struct wl_pwr_cfg pwrseqcmd[])

{

	struct wl_pwr_cfg pwrcfgcmd;

	u8 poll_bit = false;
@@ -25,8 +24,6 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, 
	do {

		pwrcfgcmd = pwrseqcmd[aryidx];



		/* Only Handle the command whose CUT is matched */

		if (GET_PWR_CFG_CUT_MASK(pwrcfgcmd) & cut_vers) {

		switch (GET_PWR_CFG_CMD(pwrcfgcmd)) {

		case PWR_CMD_READ:

			break;
@@ -37,8 +34,7 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, 
			value = usb_read8(padapter, offset);



			value &= ~(GET_PWR_CFG_MASK(pwrcfgcmd));

				value |= (GET_PWR_CFG_VALUE(pwrcfgcmd) &

					  GET_PWR_CFG_MASK(pwrcfgcmd));

			value |= (GET_PWR_CFG_VALUE(pwrcfgcmd) & GET_PWR_CFG_MASK(pwrcfgcmd));



			/*  Write the value back to system register */

			usb_write8(padapter, offset, value);
@@ -50,8 +46,7 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, 
				value = usb_read8(padapter, offset);

				value &= GET_PWR_CFG_MASK(pwrcfgcmd);



					if (value == (GET_PWR_CFG_VALUE(pwrcfgcmd) &

						      GET_PWR_CFG_MASK(pwrcfgcmd)))

				if (value == (GET_PWR_CFG_VALUE(pwrcfgcmd) & GET_PWR_CFG_MASK(pwrcfgcmd)))

					poll_bit = true;

				else

					udelay(10);
@@ -72,7 +67,6 @@ u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers, 
		default:

			break;

		}

		}



		aryidx++;/* Add Array Index */

	} while (1);

drivers/staging/rtl8188eu/hal/usb_halinit.c

+3 −6
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ u32 rtw_hal_power_on(struct adapter *adapt) 
	if (adapt->HalData->bMacPwrCtrlOn)

		return _SUCCESS;



	if (!rtl88eu_pwrseqcmdparsing(adapt, PWR_CUT_ALL_MSK,

				      Rtl8188E_NIC_PWR_ON_FLOW))

	if (!rtl88eu_pwrseqcmdparsing(adapt, Rtl8188E_NIC_PWR_ON_FLOW))

		return _FAIL;



	/*  Enable MAC DMA/WMAC/SCHEDULE/SEC block */
@@ -830,8 +829,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter) 
	usb_write8(Adapter, REG_CR, 0x0);



	/*  Run LPS WL RFOFF flow */

	rtl88eu_pwrseqcmdparsing(Adapter, PWR_CUT_ALL_MSK,

				 Rtl8188E_NIC_LPS_ENTER_FLOW);

	rtl88eu_pwrseqcmdparsing(Adapter, Rtl8188E_NIC_LPS_ENTER_FLOW);



	/*  2. 0x1F[7:0] = 0		turn off RF */
@@ -852,8 +850,7 @@ static void CardDisableRTL8188EU(struct adapter *Adapter) 
	usb_write8(Adapter, REG_32K_CTRL, val8 & (~BIT(0)));



	/*  Card disable power action flow */

	rtl88eu_pwrseqcmdparsing(Adapter, PWR_CUT_ALL_MSK,

				 Rtl8188E_NIC_DISABLE_FLOW);

	rtl88eu_pwrseqcmdparsing(Adapter, Rtl8188E_NIC_DISABLE_FLOW);



	/*  Reset MCU IO Wrapper */

	val8 = usb_read8(Adapter, REG_RSV_CTRL + 1);

drivers/staging/rtl8188eu/include/pwrseqcmd.h

+1 −3
Original line number Diff line number Diff line
@@ -41,12 +41,10 @@ struct wl_pwr_cfg { 
};



#define GET_PWR_CFG_OFFSET(__PWR_CMD)		__PWR_CMD.offset

#define GET_PWR_CFG_CUT_MASK(__PWR_CMD)		__PWR_CMD.cut_msk

#define GET_PWR_CFG_CMD(__PWR_CMD)		__PWR_CMD.cmd

#define GET_PWR_CFG_MASK(__PWR_CMD)		__PWR_CMD.msk

#define GET_PWR_CFG_VALUE(__PWR_CMD)		__PWR_CMD.value



u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, u8 cut_vers,

			    struct wl_pwr_cfg pwrcfgCmd[]);

u8 rtl88eu_pwrseqcmdparsing(struct adapter *padapter, struct wl_pwr_cfg pwrcfgCmd[]);



#endif