Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Hauke Mehrtens and committed by
John W. Linville
244a77e9 88823492

+8 -32
+2
drivers/net/wireless/rtlwifi/pci.c
··· 1982 1982 } 1983 1983 EXPORT_SYMBOL(rtl_pci_disconnect); 1984 1984 1985 + #ifdef CONFIG_PM_SLEEP 1985 1986 /*************************************** 1986 1987 kernel pci power state define: 1987 1988 PCI_D0 ((pci_power_t __force) 0) ··· 2022 2021 return 0; 2023 2022 } 2024 2023 EXPORT_SYMBOL(rtl_pci_resume); 2024 + #endif /* CONFIG_PM_SLEEP */ 2025 2025 2026 2026 struct rtl_intf_ops rtl_pci_ops = { 2027 2027 .read_efuse_byte = read_efuse_byte,
+2
drivers/net/wireless/rtlwifi/pci.h
··· 239 239 int __devinit rtl_pci_probe(struct pci_dev *pdev, 240 240 const struct pci_device_id *id); 241 241 void rtl_pci_disconnect(struct pci_dev *pdev); 242 + #ifdef CONFIG_PM_SLEEP 242 243 int rtl_pci_suspend(struct device *dev); 243 244 int rtl_pci_resume(struct device *dev); 245 + #endif /* CONFIG_PM_SLEEP */ 244 246 static inline u8 pci_read8_sync(struct rtl_priv *rtlpriv, u32 addr) 245 247 { 246 248 return readb((u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
+1 -8
drivers/net/wireless/rtlwifi/rtl8192ce/sw.c
··· 372 372 MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); 373 373 MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); 374 374 375 - static const struct dev_pm_ops rtlwifi_pm_ops = { 376 - .suspend = rtl_pci_suspend, 377 - .resume = rtl_pci_resume, 378 - .freeze = rtl_pci_suspend, 379 - .thaw = rtl_pci_resume, 380 - .poweroff = rtl_pci_suspend, 381 - .restore = rtl_pci_resume, 382 - }; 375 + static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); 383 376 384 377 static struct pci_driver rtl92ce_driver = { 385 378 .name = KBUILD_MODNAME,
+1 -8
drivers/net/wireless/rtlwifi/rtl8192de/sw.c
··· 378 378 MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); 379 379 MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); 380 380 381 - static const struct dev_pm_ops rtlwifi_pm_ops = { 382 - .suspend = rtl_pci_suspend, 383 - .resume = rtl_pci_resume, 384 - .freeze = rtl_pci_suspend, 385 - .thaw = rtl_pci_resume, 386 - .poweroff = rtl_pci_suspend, 387 - .restore = rtl_pci_resume, 388 - }; 381 + static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); 389 382 390 383 static struct pci_driver rtl92de_driver = { 391 384 .name = KBUILD_MODNAME,
+1 -8
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
··· 429 429 MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); 430 430 MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); 431 431 432 - static const struct dev_pm_ops rtlwifi_pm_ops = { 433 - .suspend = rtl_pci_suspend, 434 - .resume = rtl_pci_resume, 435 - .freeze = rtl_pci_suspend, 436 - .thaw = rtl_pci_resume, 437 - .poweroff = rtl_pci_suspend, 438 - .restore = rtl_pci_resume, 439 - }; 432 + static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); 440 433 441 434 static struct pci_driver rtl92se_driver = { 442 435 .name = KBUILD_MODNAME,
+1 -8
drivers/net/wireless/rtlwifi/rtl8723ae/sw.c
··· 367 367 MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); 368 368 MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); 369 369 370 - static const struct dev_pm_ops rtlwifi_pm_ops = { 371 - .suspend = rtl_pci_suspend, 372 - .resume = rtl_pci_resume, 373 - .freeze = rtl_pci_suspend, 374 - .thaw = rtl_pci_resume, 375 - .poweroff = rtl_pci_suspend, 376 - .restore = rtl_pci_resume, 377 - }; 370 + static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); 378 371 379 372 static struct pci_driver rtl8723ae_driver = { 380 373 .name = KBUILD_MODNAME,