Staging: rtl8192e: Use the standard config option for PM functions
PATCH 1/1 Staging: rtl8192e: Use the standard config option for PM functions
Use the standard config option CONFIG_PM to enable rtl8192e PM functions. Tested on Samsung N140 and it works fine. Without enabling the PM functions, the box always fails to resume.
Signed-off-by Yong Wang <[email protected]>
--- drivers/staging/rtl8192eMakefile | 1 + drivers/staging/rtl8192er8192E_core.c | 4 ++-- drivers/staging/rtl8192er8192_pm.c | 6 ++---- drivers/staging/rtl8192er8192_pm.h | 4 ---- 4 files changed, 5 insertions(+), 10 deletions(-)
drivers/staging/rtl8192e/Makefile +1 -0
@@ -18,6 +18,7 @@ r8192e_pci-objs := \ r819xE_firmware.o \ r819xE_cmdpkt.o \ r8192E_dm.o \ + r8192_pm.o \ ieee80211/ieee80211_rx.o \ ieee80211/ieee80211_softmac.o \ ieee80211/ieee80211_tx.o \
drivers/staging/rtl8192e/r8192E_core.c +2 -2
@@ -62,7 +62,7 @@//#include <linux/usb.h> // FIXME: check if 2.6.7 is ok -#ifdef CONFIG_PM_RTL +#ifdef CONFIG_PM #include "r8192_pm.h" #endif
@@ -146,7 +146,7 @@ static struct pci_driver rtl8192_pci_driver = { .id_table = rtl8192_pci_id_tbl, /* PCI_ID table */ .probe = rtl8192_pci_probe, /* probe fn */ .remove =__devexit_p (rtl8192_pci_disconnect),/* remove fn */ -#ifdef CONFIG_PM_RTL +#ifdef CONFIG_PM .suspend = rtl8192E_suspend,/* PM suspend fn */ .resume = rtl8192E_resume, /* PM resume fn */ #else
drivers/staging/rtl8192e/r8192_pm.c +2 -4
@@ -9,8 +9,6 @@Released under the terms of GPL (General Public Licence) */ -#ifdef CONFIG_PM_RTL -#include "r8192E.h" #include "r8192E_hw.h" #include "r8192_pm.h"
@@ -27,7 +25,9 @@ int rtl8192E_suspend (struct pci_dev *pdev, pm_message_t state) {struct net_device *dev =pci_get_drvdata (pdev);struct r8192_priv *priv =ieee80211_priv (dev); +#ifdef RTL8190P u8 ucRegRead; +#endif u32 ulRegRead;RT_TRACE (COMP_POWER ,"============> r8192E suspend call.\n" );
@@ -168,5 +168,3 @@ int rtl8192E_enable_wake (struct pci_dev *dev, pm_message_t state, int enable) state.event, enable);return (-EAGAIN ); } - -#endif //CONFIG_PM_RTL
drivers/staging/rtl8192e/r8192_pm.h +0 -4
@@ -10,8 +10,6 @@*/ -#ifdef CONFIG_PM_RTL -#ifndef R8192E_PM_H #define R8192E_PM_H
@@ -24,5 +22,3 @@ int rtl8192E_resume (struct pci_dev *dev);int rtl8192E_enable_wake (struct pci_dev *dev,pm_message_t state,int enable);#endif //R8192E_PM_H - -#endif // CONFIG_PM_RTL