Commit 3f8efa16 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove unused code block 



Remove conditional code block checked by unused CONFIG_GPIO_WAKEUP

Cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/20210310093719.GA8646@agape.jhs


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

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c

+0 −8
Original line number Diff line number Diff line
@@ -1183,11 +1183,6 @@ static void rtl8723b_set_FwWoWlanCtrl_Cmd(struct adapter *padapter, u8 bFuncEn) 
	u8 gpio_high_active = 0; /* 0: low active, 1: high active */

	u8 magic_pkt = 0;



#ifdef CONFIG_GPIO_WAKEUP

	gpionum = WAKEUP_GPIO_IDX;

	sdio_wakeup_enable = 0;

#endif



#ifdef CONFIG_PNO_SUPPORT

	if (!ppwrpriv->wowlan_pno_enable)

		magic_pkt = 1;
@@ -1358,9 +1353,6 @@ static void rtl8723b_set_FwAPWoWlanCtrl_Cmd(struct adapter *padapter, u8 bFuncEn 
	u8 gpionum = 0, gpio_dur = 0;

	u8 gpio_high_active = 1; /* 0: low active, 1: high active */

	u8 gpio_pulse = bFuncEn;

#ifdef CONFIG_GPIO_WAKEUP

	gpionum = WAKEUP_GPIO_IDX;

#endif



	DBG_871X("%s(): bFuncEn =%d\n", __func__, bFuncEn);

drivers/staging/rtl8723bs/hal/sdio_halinit.c

+0 −69
Original line number Diff line number Diff line
@@ -42,63 +42,6 @@ static u8 CardEnable(struct adapter *padapter) 
	return ret;

}



#ifdef CONFIG_GPIO_WAKEUP

/* we set it high under init and fw will */

/* give us Low Pulse when host wake up */

void HostWakeUpGpioClear(struct adapter *Adapter)

{

	u32 value32;



	value32 = rtw_read32(Adapter, REG_GPIO_PIN_CTRL_2);



	/* set GPIO 12 1 */

	value32 |= BIT(12);/* 4+8 */

	/* GPIO 12 out put */

	value32 |= BIT(20);/* 4+16 */



	rtw_write32(Adapter, REG_GPIO_PIN_CTRL_2, value32);

} /* HostWakeUpGpioClear */



void HalSetOutPutGPIO(struct adapter *padapter, u8 index, u8 OutPutValue)

{

	if (index <= 7) {

		/* config GPIO mode */

		rtw_write8(padapter, REG_GPIO_PIN_CTRL + 3, rtw_read8(padapter, REG_GPIO_PIN_CTRL + 3) & ~BIT(index));



		/* config GPIO Sel */

		/* 0: input */

		/* 1: output */

		rtw_write8(padapter, REG_GPIO_PIN_CTRL + 2, rtw_read8(padapter, REG_GPIO_PIN_CTRL + 2) | BIT(index));



		/* set output value */

		if (OutPutValue)

			rtw_write8(padapter, REG_GPIO_PIN_CTRL + 1, rtw_read8(padapter, REG_GPIO_PIN_CTRL + 1) | BIT(index));

		else

			rtw_write8(padapter, REG_GPIO_PIN_CTRL + 1, rtw_read8(padapter, REG_GPIO_PIN_CTRL + 1) & ~BIT(index));

	} else {

		/* 88C Series: */

		/* index: 11~8 transform to 3~0 */

		/* 8723 Series: */

		/* index: 12~8 transform to 4~0 */

		index -= 8;



		/* config GPIO mode */

		rtw_write8(padapter, REG_GPIO_PIN_CTRL_2 + 3, rtw_read8(padapter, REG_GPIO_PIN_CTRL_2 + 3) & ~BIT(index));



		/* config GPIO Sel */

		/* 0: input */

		/* 1: output */

		rtw_write8(padapter, REG_GPIO_PIN_CTRL_2 + 2, rtw_read8(padapter, REG_GPIO_PIN_CTRL_2 + 2) | BIT(index));



		/* set output value */

		if (OutPutValue)

			rtw_write8(padapter, REG_GPIO_PIN_CTRL_2 + 1, rtw_read8(padapter, REG_GPIO_PIN_CTRL_2 + 1) | BIT(index));

		else

			rtw_write8(padapter, REG_GPIO_PIN_CTRL_2 + 1, rtw_read8(padapter, REG_GPIO_PIN_CTRL_2 + 1) & ~BIT(index));

	}

}

#endif



static

u8 _InitPowerOn_8723BS(struct adapter *padapter)

{
@@ -190,10 +133,6 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter) 
	rtw_write8(padapter, REG_PAD_CTRL1_8723B, value8);

/* 	DBG_8192C("%s: REG_PAD_CTRL1(0x%x) = 0x%02X\n", __func__, REG_PAD_CTRL1_8723B, rtw_read8(padapter, REG_PAD_CTRL1_8723B)); */



#ifdef CONFIG_GPIO_WAKEUP

	HostWakeUpGpioClear(padapter);

#endif



	return _SUCCESS;

}
@@ -1609,10 +1548,6 @@ static void SetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val) 
				DBG_871X_LEVEL(_drv_always_, "Re-download Normal FW!\n");

				SetFwRelatedForWoWLAN8723b(padapter, false);

			}

#ifdef CONFIG_GPIO_WAKEUP

			DBG_871X_LEVEL(_drv_always_, "Set Wake GPIO to high for default.\n");

			HalSetOutPutGPIO(padapter, WAKEUP_GPIO_IDX, 1);

#endif



			/*  5. Download reserved pages and report media status if needed. */

			if (
@@ -1727,10 +1662,6 @@ static void SetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val) 


			SetFwRelatedForWoWLAN8723b(padapter, false);



#ifdef CONFIG_GPIO_WAKEUP

		DBG_871X_LEVEL(_drv_always_, "Set Wake GPIO to high for default.\n");

		HalSetOutPutGPIO(padapter, WAKEUP_GPIO_IDX, 1);

#endif /* CONFIG_GPIO_WAKEUP */

		rtl8723b_set_FwJoinBssRpt_cmd(padapter, RT_MEDIA_CONNECT);

		issue_beacon(padapter, 0);

		break;

drivers/staging/rtl8723bs/include/rtl8723b_hal.h

+0 −4
Original line number Diff line number Diff line
@@ -268,10 +268,6 @@ void rtl8723bs_cancle_checkbthang_workqueue(struct adapter *adapter); 
void rtl8723bs_hal_check_bt_hang(struct adapter *adapter);

#endif



#ifdef CONFIG_GPIO_WAKEUP

void HalSetOutPutGPIO(struct adapter *padapter, u8 index, u8 OutPutValue);

#endif



int FirmwareDownloadBT(struct adapter *adapter, struct rt_firmware *firmware);



void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u8 *pdata, u8 len);

drivers/staging/rtl8723bs/os_dep/sdio_intf.c

+0 −57
Original line number Diff line number Diff line
@@ -117,55 +117,6 @@ static void sdio_free_irq(struct dvobj_priv *dvobj) 
	}

}



#ifdef CONFIG_GPIO_WAKEUP

extern unsigned int oob_irq;

static irqreturn_t gpio_hostwakeup_irq_thread(int irq, void *data)

{

	struct adapter *padapter = data;

	DBG_871X_LEVEL(_drv_always_, "gpio_hostwakeup_irq_thread\n");

	/* Disable interrupt before calling handler */

	/* disable_irq_nosync(oob_irq); */

	rtw_lock_suspend_timeout(HZ/2);

	return IRQ_HANDLED;

}



static u8 gpio_hostwakeup_alloc_irq(struct adapter *padapter)

{

	int err;



	if (oob_irq == 0) {

		DBG_871X("oob_irq ZERO!\n");

		return _FAIL;

	}

	/* dont set it IRQF_TRIGGER_LOW, or wowlan */

	/* power is high after suspend */

	/* and failing can prevent can not sleep issue if */

	/* wifi gpio12 pin is not linked with CPU */

	err = request_threaded_irq(oob_irq, gpio_hostwakeup_irq_thread, NULL,

		/* IRQF_TRIGGER_LOW | IRQF_ONESHOT, */

		IRQF_TRIGGER_FALLING,

		"rtw_wifi_gpio_wakeup", padapter);

	if (err < 0) {

		DBG_871X("Oops: can't allocate gpio irq %d err:%d\n", oob_irq, err);

		return false;

	} else {

		DBG_871X("allocate gpio irq %d ok\n", oob_irq);

	}



	enable_irq_wake(oob_irq);

	return _SUCCESS;

}



static void gpio_hostwakeup_free_irq(struct adapter *padapter)

{

	if (oob_irq == 0)

		return;



	disable_irq_wake(oob_irq);

	free_irq(oob_irq, padapter);

}

#endif



static u32 sdio_init(struct dvobj_priv *dvobj)

{

	struct sdio_data *psdio_data;
@@ -424,10 +375,6 @@ static void rtw_sdio_if1_deinit(struct adapter *if1) 


	free_mlme_ap_info(if1);



#ifdef CONFIG_GPIO_WAKEUP

	gpio_hostwakeup_free_irq(if1);

#endif



	rtw_cancel_all_timer(if1);



#ifdef CONFIG_WOWLAN
@@ -482,10 +429,6 @@ static int rtw_drv_init( 
	if (sdio_alloc_irq(dvobj) != _SUCCESS)

		goto free_if2;



#ifdef	CONFIG_GPIO_WAKEUP

	gpio_hostwakeup_alloc_irq(if1);

#endif



	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-871x_drv - drv_init, success!\n"));



	rtw_ndev_notifier_register();