Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 244a77e9 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

rtlwifi: use SIMPLE_DEV_PM_OPS 



rtlwifi only provides pm callbacks for functions covered by pm sleep
and they are also just called if CONFIG_PM_SLEEP is set.

Only add functions rtl_pci_suspend and rtl_pci_resume if
CONFIG_PM_SLEEP is set and use SIMPLE_DEV_PM_OPS instead of
manually filling struct dev_pm_ops.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 88823492

drivers/net/wireless/rtlwifi/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -1982,6 +1982,7 @@ void rtl_pci_disconnect(struct pci_dev *pdev) 
}

EXPORT_SYMBOL(rtl_pci_disconnect);



#ifdef CONFIG_PM_SLEEP

/***************************************

kernel pci power state define:

PCI_D0         ((pci_power_t __force) 0)
@@ -2021,6 +2022,7 @@ int rtl_pci_resume(struct device *dev) 
	return 0;

}

EXPORT_SYMBOL(rtl_pci_resume);

#endif /* CONFIG_PM_SLEEP */



struct rtl_intf_ops rtl_pci_ops = {

	.read_efuse_byte = read_efuse_byte,

drivers/net/wireless/rtlwifi/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -239,8 +239,10 @@ extern struct rtl_intf_ops rtl_pci_ops; 
int __devinit rtl_pci_probe(struct pci_dev *pdev,

			    const struct pci_device_id *id);

void rtl_pci_disconnect(struct pci_dev *pdev);

#ifdef CONFIG_PM_SLEEP

int rtl_pci_suspend(struct device *dev);

int rtl_pci_resume(struct device *dev);

#endif /* CONFIG_PM_SLEEP */

static inline u8 pci_read8_sync(struct rtl_priv *rtlpriv, u32 addr)

{

	return readb((u8 __iomem *) rtlpriv->io.pci_mem_start + addr);

drivers/net/wireless/rtlwifi/rtl8192ce/sw.c

+1 −8
Original line number Diff line number Diff line
@@ -372,14 +372,7 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); 
MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");

MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");



static const struct dev_pm_ops rtlwifi_pm_ops = {

	.suspend = rtl_pci_suspend,

	.resume = rtl_pci_resume,

	.freeze = rtl_pci_suspend,

	.thaw = rtl_pci_resume,

	.poweroff = rtl_pci_suspend,

	.restore = rtl_pci_resume,

};

static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);



static struct pci_driver rtl92ce_driver = {

	.name = KBUILD_MODNAME,

drivers/net/wireless/rtlwifi/rtl8192de/sw.c

+1 −8
Original line number Diff line number Diff line
@@ -378,14 +378,7 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); 
MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");

MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");



static const struct dev_pm_ops rtlwifi_pm_ops = {

	.suspend = rtl_pci_suspend,

	.resume = rtl_pci_resume,

	.freeze = rtl_pci_suspend,

	.thaw = rtl_pci_resume,

	.poweroff = rtl_pci_suspend,

	.restore = rtl_pci_resume,

};

static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);



static struct pci_driver rtl92de_driver = {

	.name = KBUILD_MODNAME,

drivers/net/wireless/rtlwifi/rtl8192se/sw.c

+1 −8
Original line number Diff line number Diff line
@@ -429,14 +429,7 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use SW control power save (default 0)\n"); 
MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");

MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");



static const struct dev_pm_ops rtlwifi_pm_ops = {

	.suspend = rtl_pci_suspend,

	.resume = rtl_pci_resume,

	.freeze = rtl_pci_suspend,

	.thaw = rtl_pci_resume,

	.poweroff = rtl_pci_suspend,

	.restore = rtl_pci_resume,

};

static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume);



static struct pci_driver rtl92se_driver = {

	.name = KBUILD_MODNAME,