staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_GPIO_API

remove conditional code blocks checked by unused
CONFIG_GPIO_API

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Changes in v2:
	rebase of conflicting code in public staging-testing

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/20210316142714.GA3368@agape.jhs
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 052d587642e1a60098cba640c21a41b45bbbce42..087073c211ec0d2b15e13eaf676852dcfe9cc664 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -2014,98 +2014,3 @@ struct adapter *dvobj_get_port0_adapter(struct dvobj_priv *dvobj)
 
        return dvobj->padapters;
 }
-
-#ifdef CONFIG_GPIO_API
-int rtw_get_gpio(struct net_device *netdev, int gpio_num)
-{
-       u8 value;
-       u8 direction;
-       struct adapter *adapter = rtw_netdev_priv(netdev);
-       struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(adapter);
-
-       rtw_ps_deny(adapter, PS_DENY_IOCTL);
-
-       DBG_871X("rf_pwrstate = 0x%02x\n", pwrpriv->rf_pwrstate);
-       LeaveAllPowerSaveModeDirect(adapter);
-
-       /* Read GPIO Direction */
-       direction = (rtw_read8(adapter, REG_GPIO_PIN_CTRL + 2) & BIT(gpio_num)) >> gpio_num;
-
-       /* According the direction to read register value */
-       if (direction)
-               value = (rtw_read8(adapter, REG_GPIO_PIN_CTRL + 1) & BIT(gpio_num)) >> gpio_num;
-       else
-               value = (rtw_read8(adapter, REG_GPIO_PIN_CTRL) & BIT(gpio_num)) >> gpio_num;
-
-       rtw_ps_deny_cancel(adapter, PS_DENY_IOCTL);
-       DBG_871X("%s direction =%d value =%d\n", __func__, direction, value);
-
-       return value;
-}
-EXPORT_SYMBOL(rtw_get_gpio);
-
-int  rtw_set_gpio_output_value(struct net_device *netdev, int gpio_num, bool isHigh)
-{
-       u8 direction = 0;
-       u8 res = -1;
-       struct adapter *adapter = rtw_netdev_priv(netdev);
-
-       /* Check GPIO is 4~7 */
-       if (gpio_num > 7 || gpio_num < 4) {
-               DBG_871X("%s The gpio number does not included 4~7.\n", __func__);
-               return -1;
-       }
-
-       rtw_ps_deny(adapter, PS_DENY_IOCTL);
-
-       LeaveAllPowerSaveModeDirect(adapter);
-
-       /* Read GPIO direction */
-       direction = (rtw_read8(adapter, REG_GPIO_PIN_CTRL + 2) & BIT(gpio_num)) >> gpio_num;
-
-       /* If GPIO is output direction, setting value. */
-       if (direction) {
-               if (isHigh)
-                       rtw_write8(adapter, REG_GPIO_PIN_CTRL + 1, rtw_read8(adapter, REG_GPIO_PIN_CTRL + 1) | BIT(gpio_num));
-               else
-                       rtw_write8(adapter, REG_GPIO_PIN_CTRL + 1, rtw_read8(adapter, REG_GPIO_PIN_CTRL + 1) & ~BIT(gpio_num));
-
-               DBG_871X("%s Set gpio %x[%d]=%d\n", __func__, REG_GPIO_PIN_CTRL+1, gpio_num, isHigh);
-               res = 0;
-       } else {
-               DBG_871X("%s The gpio is input, not be set!\n", __func__);
-               res = -1;
-       }
-
-       rtw_ps_deny_cancel(adapter, PS_DENY_IOCTL);
-       return res;
-}
-EXPORT_SYMBOL(rtw_set_gpio_output_value);
-
-int rtw_config_gpio(struct net_device *netdev, int gpio_num, bool isOutput)
-{
-       struct adapter *adapter = rtw_netdev_priv(netdev);
-
-       if (gpio_num > 7 || gpio_num < 4) {
-               DBG_871X("%s The gpio number does not included 4~7.\n", __func__);
-               return -1;
-       }
-
-       DBG_871X("%s gpio_num =%d direction =%d\n", __func__, gpio_num, isOutput);
-
-       rtw_ps_deny(adapter, PS_DENY_IOCTL);
-
-       LeaveAllPowerSaveModeDirect(adapter);
-
-       if (isOutput)
-               rtw_write8(adapter, REG_GPIO_PIN_CTRL + 2, rtw_read8(adapter, REG_GPIO_PIN_CTRL + 2) | BIT(gpio_num));
-       else
-               rtw_write8(adapter, REG_GPIO_PIN_CTRL + 2, rtw_read8(adapter, REG_GPIO_PIN_CTRL + 2) & ~BIT(gpio_num));
-
-       rtw_ps_deny_cancel(adapter, PS_DENY_IOCTL);
-
-       return 0;
-}
-EXPORT_SYMBOL(rtw_config_gpio);
-#endif
-

diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index 49f10ff6d54c7263b255ad22a33d7fc447bf4c80..079feaf5b47fd542ca4e865e125d7e7cca1f2131 100644 (file)
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -528,12 +528,6 @@ static inline void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit)
                         (padapter)->bSurpriseRemoved || \
                         RTW_IS_FUNC_DISABLED((padapter), DF_TX_BIT))
 
-#ifdef CONFIG_GPIO_API
-int rtw_get_gpio(struct net_device *netdev, int gpio_num);
-int rtw_set_gpio_output_value(struct net_device *netdev, int gpio_num, bool isHigh);
-int rtw_config_gpio(struct net_device *netdev, int gpio_num, bool isOutput);
-#endif
-
 static inline u8 *myid(struct eeprom_priv *peepriv)
 {
        return peepriv->mac_addr;

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 114f45cf0fa135c614d71662514c7db9490720fa..e8aac555195ca036df12db293e53d0a503dccbf9 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -3063,46 +3063,6 @@ static int rtw_dbg_port(struct net_device *dev,
                                        {
                                                break;
                                        }
-#ifdef CONFIG_GPIO_API
-                           case 0x25: /* Get GPIO register */
-                                   {
-                                           /*
-                                           * dbg 0x7f250000 [gpio_num], Get gpio value, gpio_num:0~7
-                                           */
-
-                                           int value;
-                                           DBG_871X("Read GPIO Value  extra_arg = %d\n", extra_arg);
-                                           value = rtw_get_gpio(dev, extra_arg);
-                                           DBG_871X("Read GPIO Value = %d\n", value);
-                                           break;
-                                   }
-                           case 0x26: /* Set GPIO direction */
-                                   {
-
-                                           /* dbg 0x7f26000x [y], Set gpio direction,
-                                           * x: gpio_num, 4~7  y: indicate direction, 0~1
-                                           */
-
-                                           int value;
-                                           DBG_871X("Set GPIO Direction! arg = %d , extra_arg =%d\n", arg, extra_arg);
-                                           value = rtw_config_gpio(dev, arg, extra_arg);
-                                           DBG_871X("Set GPIO Direction %s\n", (value == -1) ? "Fail!!!" : "Success");
-                                           break;
-                                       }
-                               case 0x27: /* Set GPIO output direction value */
-                                       {
-                                               /*
-                                               * dbg 0x7f27000x [y], Set gpio output direction value,
-                                               * x: gpio_num, 4~7  y: indicate direction, 0~1
-                                               */
-
-                                               int value;
-                                               DBG_871X("Set GPIO Value! arg = %d , extra_arg =%d\n", arg, extra_arg);
-                                               value = rtw_set_gpio_output_value(dev, arg, extra_arg);
-                                               DBG_871X("Set GPIO Value %s\n", (value == -1) ? "Fail!!!" : "Success");
-                                               break;
-                                       }
-#endif
                                case 0xaa:
                                        {
                                                if ((extra_arg & 0x7F) > 0x3F)