From 5b774ec296657f219890adb274e7455ec2e21af6 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 13 Jul 2011 00:16:54 -0500 Subject: [PATCH] staging: rtl8192e: Remove references to ENABLE_GPIO_RADIO_CTL This configuration variable is set in the make file. Signed-off-by: Larry Finger --- drivers/staging/rtl8192e/Makefile | 1 - drivers/staging/rtl8192e/rtl_core.c | 6 ------ drivers/staging/rtl8192e/rtl_pm.c | 4 ---- 3 files changed, 11 deletions(-) diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile index 594abc0a95f1..9ad6b4e44691 100644 --- a/drivers/staging/rtl8192e/Makefile +++ b/drivers/staging/rtl8192e/Makefile @@ -1,6 +1,5 @@ ccflags-y += -DEEPROM_OLD_FORMAT_SUPPORT=1 ccflags-y += -DUSE_FW_SOURCE_IMG_FILE -ccflags-y += -DENABLE_GPIO_RADIO_CTL ccflags-y += -DCONFIG_PM_RTL ccflags-y += -DCONFIG_PM ccflags-y += -DENABLE_DOT11D diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index db3c64974a7d..062e19bad640 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -1037,11 +1037,9 @@ int _rtl8192_sta_up(struct net_device *dev,bool is_silent_reset) RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); priv->bfirst_init = false; -#ifdef ENABLE_GPIO_RADIO_CTL if (priv->polling_timer_on == 0){ check_rfctrl_gpio_timer((unsigned long)dev); } -#endif if (priv->rtllib->state != RTLLIB_LINKED) rtllib_softmac_start_protocol(priv->rtllib, 0); @@ -3131,11 +3129,9 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev, } rtl8192_proc_init_one(dev); -#ifdef ENABLE_GPIO_RADIO_CTL if (priv->polling_timer_on == 0){ check_rfctrl_gpio_timer((unsigned long)dev); } -#endif #ifdef CONFIG_RTL_RFKILL if (priv->ops->init_before_adapter_start) { priv->ops->init_before_adapter_start(dev); @@ -3186,11 +3182,9 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev) priv = rtllib_priv(dev); -#ifdef ENABLE_GPIO_RADIO_CTL del_timer_sync(&priv->gpio_polling_timer); cancel_delayed_work(&priv->gpio_change_rf_wq); priv->polling_timer_on = 0; -#endif rtl_debug_module_remove(priv); rtl8192_proc_remove_one(dev); rtl8192_down(dev,true); diff --git a/drivers/staging/rtl8192e/rtl_pm.c b/drivers/staging/rtl8192e/rtl_pm.c index bcefe2d6e044..af1c8201e01d 100644 --- a/drivers/staging/rtl8192e/rtl_pm.c +++ b/drivers/staging/rtl8192e/rtl_pm.c @@ -38,11 +38,9 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state) RT_TRACE(COMP_POWER, "============> r8192E suspend call.\n"); printk("============> r8192E suspend call.\n"); -#ifdef ENABLE_GPIO_RADIO_CTL del_timer_sync(&priv->gpio_polling_timer); cancel_delayed_work(&priv->gpio_change_rf_wq); priv->polling_timer_on = 0; -#endif if (!netif_running(dev)){ printk("RTL819XE:UI is open out of suspend function\n"); @@ -113,11 +111,9 @@ int rtl8192E_resume (struct pci_dev *pdev) pci_enable_wake(pdev, PCI_D0, 0); -#ifdef ENABLE_GPIO_RADIO_CTL if (priv->polling_timer_on == 0){ check_rfctrl_gpio_timer((unsigned long)dev); } -#endif if (!netif_running(dev)){ printk("RTL819XE:UI is open out of resume function\n"); -- 2.11.0