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

misc / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

Replace CONFIG_PM_RUNTIME with CONFIG_PM everywhere under
drivers/misc/.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Rafael J. Wysocki bbd6d050 e243c7c1

+13 -17
+2 -2
drivers/misc/apds990x.c
··· 609 609 return ret; 610 610 } 611 611 612 - #if defined(CONFIG_PM) || defined(CONFIG_PM_RUNTIME) 612 + #ifdef CONFIG_PM 613 613 static int apds990x_chip_on(struct apds990x_chip *chip) 614 614 { 615 615 int err = regulator_bulk_enable(ARRAY_SIZE(chip->regs), ··· 1237 1237 } 1238 1238 #endif 1239 1239 1240 - #ifdef CONFIG_PM_RUNTIME 1240 + #ifdef CONFIG_PM 1241 1241 static int apds990x_runtime_suspend(struct device *dev) 1242 1242 { 1243 1243 struct i2c_client *client = container_of(dev, struct i2c_client, dev);
+1 -1
drivers/misc/bh1770glc.c
··· 1358 1358 } 1359 1359 #endif 1360 1360 1361 - #ifdef CONFIG_PM_RUNTIME 1361 + #ifdef CONFIG_PM 1362 1362 static int bh1770_runtime_suspend(struct device *dev) 1363 1363 { 1364 1364 struct i2c_client *client = container_of(dev, struct i2c_client, dev);
+2 -2
drivers/misc/lis3lv02d/lis3lv02d_i2c.c
··· 235 235 } 236 236 #endif /* CONFIG_PM_SLEEP */ 237 237 238 - #ifdef CONFIG_PM_RUNTIME 238 + #ifdef CONFIG_PM 239 239 static int lis3_i2c_runtime_suspend(struct device *dev) 240 240 { 241 241 struct i2c_client *client = container_of(dev, struct i2c_client, dev); ··· 253 253 lis3lv02d_poweron(lis3); 254 254 return 0; 255 255 } 256 - #endif /* CONFIG_PM_RUNTIME */ 256 + #endif /* CONFIG_PM */ 257 257 258 258 static const struct i2c_device_id lis3lv02d_id[] = { 259 259 {"lis3lv02d", LIS3LV02D},
+2 -2
drivers/misc/mei/mei_dev.h
··· 530 530 * Power Gating support 531 531 */ 532 532 enum mei_pg_event pg_event; 533 - #ifdef CONFIG_PM_RUNTIME 533 + #ifdef CONFIG_PM 534 534 struct dev_pm_domain pg_domain; 535 - #endif /* CONFIG_PM_RUNTIME */ 535 + #endif /* CONFIG_PM */ 536 536 537 537 unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE]; 538 538 u32 rd_msg_hdr;
+3 -5
drivers/misc/mei/pci-me.c
··· 89 89 90 90 MODULE_DEVICE_TABLE(pci, mei_me_pci_tbl); 91 91 92 - #ifdef CONFIG_PM_RUNTIME 92 + #ifdef CONFIG_PM 93 93 static inline void mei_me_set_pm_domain(struct mei_device *dev); 94 94 static inline void mei_me_unset_pm_domain(struct mei_device *dev); 95 95 #else 96 96 static inline void mei_me_set_pm_domain(struct mei_device *dev) {} 97 97 static inline void mei_me_unset_pm_domain(struct mei_device *dev) {} 98 - #endif /* CONFIG_PM_RUNTIME */ 98 + #endif /* CONFIG_PM */ 99 99 100 100 /** 101 101 * mei_me_quirk_probe - probe for devices that doesn't valid ME interface ··· 357 357 } 358 358 #endif /* CONFIG_PM_SLEEP */ 359 359 360 - #ifdef CONFIG_PM_RUNTIME 360 + #ifdef CONFIG_PM 361 361 static int mei_me_pm_runtime_idle(struct device *device) 362 362 { 363 363 struct pci_dev *pdev = to_pci_dev(device); ··· 453 453 /* stop using pm callbacks if any */ 454 454 dev->dev->pm_domain = NULL; 455 455 } 456 - #endif /* CONFIG_PM_RUNTIME */ 457 456 458 - #ifdef CONFIG_PM 459 457 static const struct dev_pm_ops mei_me_pm_ops = { 460 458 SET_SYSTEM_SLEEP_PM_OPS(mei_me_pci_suspend, 461 459 mei_me_pci_resume)
+3 -5
drivers/misc/mei/pci-txe.c
··· 42 42 }; 43 43 MODULE_DEVICE_TABLE(pci, mei_txe_pci_tbl); 44 44 45 - #ifdef CONFIG_PM_RUNTIME 45 + #ifdef CONFIG_PM 46 46 static inline void mei_txe_set_pm_domain(struct mei_device *dev); 47 47 static inline void mei_txe_unset_pm_domain(struct mei_device *dev); 48 48 #else 49 49 static inline void mei_txe_set_pm_domain(struct mei_device *dev) {} 50 50 static inline void mei_txe_unset_pm_domain(struct mei_device *dev) {} 51 - #endif /* CONFIG_PM_RUNTIME */ 51 + #endif /* CONFIG_PM */ 52 52 53 53 static void mei_txe_pci_iounmap(struct pci_dev *pdev, struct mei_txe_hw *hw) 54 54 { ··· 295 295 } 296 296 #endif /* CONFIG_PM_SLEEP */ 297 297 298 - #ifdef CONFIG_PM_RUNTIME 298 + #ifdef CONFIG_PM 299 299 static int mei_txe_pm_runtime_idle(struct device *device) 300 300 { 301 301 struct pci_dev *pdev = to_pci_dev(device); ··· 401 401 /* stop using pm callbacks if any */ 402 402 dev->dev->pm_domain = NULL; 403 403 } 404 - #endif /* CONFIG_PM_RUNTIME */ 405 404 406 - #ifdef CONFIG_PM 407 405 static const struct dev_pm_ops mei_txe_pm_ops = { 408 406 SET_SYSTEM_SLEEP_PM_OPS(mei_txe_pci_suspend, 409 407 mei_txe_pci_resume)