Commit f6094990 authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent c9d9a801
...@@ -1147,11 +1147,7 @@ static void rtl8192_init_priv_handler(struct net_device* dev) ...@@ -1147,11 +1147,7 @@ static void rtl8192_init_priv_handler(struct net_device* dev)
priv->rtllib->ScanOperationBackupHandler = PHY_ScanOperationBackup8192; priv->rtllib->ScanOperationBackupHandler = PHY_ScanOperationBackup8192;
#ifdef CONFIG_RTL_RFKILL
priv->rtllib->rtllib_rfkill_poll = rtl8192_rfkill_poll;
#else
priv->rtllib->rtllib_rfkill_poll = NULL; priv->rtllib->rtllib_rfkill_poll = NULL;
#endif
} }
static void rtl8192_init_priv_constant(struct net_device* dev) static void rtl8192_init_priv_constant(struct net_device* dev)
...@@ -3056,15 +3052,6 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, ...@@ -3056,15 +3052,6 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
if (priv->polling_timer_on == 0){ if (priv->polling_timer_on == 0){
check_rfctrl_gpio_timer((unsigned long)dev); check_rfctrl_gpio_timer((unsigned long)dev);
} }
#ifdef CONFIG_RTL_RFKILL
if (priv->ops->init_before_adapter_start) {
priv->ops->init_before_adapter_start(dev);
priv->initialized_at_probe = true;
}
if (!rtl8192_rfkill_init(dev)) {
goto fail1;
}
#endif
RT_TRACE(COMP_INIT, "Driver probe completed\n"); RT_TRACE(COMP_INIT, "Driver probe completed\n");
return 0; return 0;
...@@ -3099,9 +3086,6 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev) ...@@ -3099,9 +3086,6 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct r8192_priv *priv ; struct r8192_priv *priv ;
if (dev){ if (dev){
#ifdef CONFIG_RTL_RFKILL
rtl8192_rfkill_exit(dev);
#endif
unregister_netdev(dev); unregister_netdev(dev);
priv = rtllib_priv(dev); priv = rtllib_priv(dev);
......
...@@ -56,10 +56,6 @@ ...@@ -56,10 +56,6 @@
#include "r8190P_def.h" #include "r8190P_def.h"
#include "r8192E_dev.h" #include "r8192E_dev.h"
#ifdef CONFIG_RTL_RFKILL
#include "rtl_rfkill.h"
#endif
#include "rtl_debug.h" #include "rtl_debug.h"
#include "rtl_eeprom.h" #include "rtl_eeprom.h"
#include "rtl_ps.h" #include "rtl_ps.h"
...@@ -678,9 +674,6 @@ typedef struct r8192_priv ...@@ -678,9 +674,6 @@ typedef struct r8192_priv
u8 RegCWinMin; u8 RegCWinMin;
u8 keepAliveLevel; u8 keepAliveLevel;
#ifdef CONFIG_RTL_RFKILL
bool rfkill_off;
#endif
bool sw_radio_on; bool sw_radio_on;
bool bHwRadioOff; bool bHwRadioOff;
bool pwrdown; bool pwrdown;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment