summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/r8192_pm.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-08-12 16:37:26 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:32 -0700
commit96a51d06ccaeb2ca7e23d9e7b9b91c4a45471841 (patch)
treef136ce6b441eef9ca103061a1d7c784521cc473e /drivers/staging/rtl8192e/r8192_pm.c
parent19bebc5217c0798a16b56c18609e0f52db6b0924 (diff)
downloadop-kernel-dev-96a51d06ccaeb2ca7e23d9e7b9b91c4a45471841.zip
op-kernel-dev-96a51d06ccaeb2ca7e23d9e7b9b91c4a45471841.tar.gz
Staging: rtl8192e: remove kernel version checks
This removes a lot of code that is never built in to the driver. The size of the built code after this patch is identical to before it. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/r8192_pm.c')
-rw-r--r--drivers/staging/rtl8192e/r8192_pm.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/rtl8192e/r8192_pm.c b/drivers/staging/rtl8192e/r8192_pm.c
index d0f7c21..f898a19 100644
--- a/drivers/staging/rtl8192e/r8192_pm.c
+++ b/drivers/staging/rtl8192e/r8192_pm.c
@@ -55,26 +55,12 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state)
write_nic_dword(dev,ISR,read_nic_dword(dev, ISR));
/* need to free DM related functions */
-#if LINUX_VERSION_CODE >=KERNEL_VERSION(2,6,20)
cancel_work_sync(&priv->reset_wq);
-#else
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
- cancel_delayed_work(&priv->reset_wq);
-#endif
-#endif
del_timer_sync(&priv->fsync_timer);
del_timer_sync(&priv->watch_dog_timer);
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
cancel_delayed_work(&priv->watch_dog_wq);
cancel_delayed_work(&priv->update_beacon_wq);
-#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
cancel_work_sync(&priv->qos_activate);
-#else
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
- cancel_delayed_work(&priv->qos_activate);
-#endif
-#endif
/* TODO
#if ((DEV_BUS_TYPE == PCI_INTERFACE) && (HAL_CODE_BASE == RTL8192))
OpenPOWER on IntegriCloud