p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

misc / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM 

After commit b2b49ccbdd (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>
This commit is contained in:
Rafael J. Wysocki 2014-12-04 22:43:07 +01:00
parent e243c7c1a4
commit bbd6d05075
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/apds990x.c
View File

@ -609,7 +609,7 @@ static int apds990x_detect(struct apds990x_chip *chip)
return ret; return ret;
} }
#if defined(CONFIG_PM) || defined(CONFIG_PM_RUNTIME) #ifdef CONFIG_PM
static int apds990x_chip_on(struct apds990x_chip *chip) static int apds990x_chip_on(struct apds990x_chip *chip)
{ {
int err = regulator_bulk_enable(ARRAY_SIZE(chip->regs), int err = regulator_bulk_enable(ARRAY_SIZE(chip->regs),
@ -1237,7 +1237,7 @@ static int apds990x_resume(struct device *dev)
} }
#endif #endif
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int apds990x_runtime_suspend(struct device *dev) static int apds990x_runtime_suspend(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = container_of(dev, struct i2c_client, dev);

2
drivers/misc/bh1770glc.c
View File

@ -1358,7 +1358,7 @@ static int bh1770_resume(struct device *dev)
} }
#endif #endif
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int bh1770_runtime_suspend(struct device *dev) static int bh1770_runtime_suspend(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = container_of(dev, struct i2c_client, dev);

4
drivers/misc/lis3lv02d/lis3lv02d_i2c.c
View File

@ -235,7 +235,7 @@ static int lis3lv02d_i2c_resume(struct device *dev)
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int lis3_i2c_runtime_suspend(struct device *dev) static int lis3_i2c_runtime_suspend(struct device *dev)
{ {
struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct i2c_client *client = container_of(dev, struct i2c_client, dev);
@ -253,7 +253,7 @@ static int lis3_i2c_runtime_resume(struct device *dev)
lis3lv02d_poweron(lis3); lis3lv02d_poweron(lis3);
return 0; return 0;
} }
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
static const struct i2c_device_id lis3lv02d_id[] = { static const struct i2c_device_id lis3lv02d_id[] = {
{"lis3lv02d", LIS3LV02D}, {"lis3lv02d", LIS3LV02D},

4
drivers/misc/mei/mei_dev.h
View File

@ -530,9 +530,9 @@ struct mei_device {
* Power Gating support * Power Gating support
*/ */
enum mei_pg_event pg_event; enum mei_pg_event pg_event;
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
struct dev_pm_domain pg_domain; struct dev_pm_domain pg_domain;
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE]; unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE];
u32 rd_msg_hdr; u32 rd_msg_hdr;

8
drivers/misc/mei/pci-me.c
View File

@ -89,13 +89,13 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, mei_me_pci_tbl); MODULE_DEVICE_TABLE(pci, mei_me_pci_tbl);
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static inline void mei_me_set_pm_domain(struct mei_device *dev); static inline void mei_me_set_pm_domain(struct mei_device *dev);
static inline void mei_me_unset_pm_domain(struct mei_device *dev); static inline void mei_me_unset_pm_domain(struct mei_device *dev);
#else #else
static inline void mei_me_set_pm_domain(struct mei_device *dev) {} static inline void mei_me_set_pm_domain(struct mei_device *dev) {}
static inline void mei_me_unset_pm_domain(struct mei_device *dev) {} static inline void mei_me_unset_pm_domain(struct mei_device *dev) {}
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
/** /**
* mei_me_quirk_probe - probe for devices that doesn't valid ME interface * mei_me_quirk_probe - probe for devices that doesn't valid ME interface
@ -357,7 +357,7 @@ static int mei_me_pci_resume(struct device *device)
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int mei_me_pm_runtime_idle(struct device *device) static int mei_me_pm_runtime_idle(struct device *device)
{ {
struct pci_dev *pdev = to_pci_dev(device); struct pci_dev *pdev = to_pci_dev(device);
@ -453,9 +453,7 @@ static inline void mei_me_unset_pm_domain(struct mei_device *dev)
/* stop using pm callbacks if any */ /* stop using pm callbacks if any */
dev->dev->pm_domain = NULL; dev->dev->pm_domain = NULL;
} }
#endif /* CONFIG_PM_RUNTIME */
#ifdef CONFIG_PM
static const struct dev_pm_ops mei_me_pm_ops = { static const struct dev_pm_ops mei_me_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(mei_me_pci_suspend, SET_SYSTEM_SLEEP_PM_OPS(mei_me_pci_suspend,
mei_me_pci_resume) mei_me_pci_resume)

8
drivers/misc/mei/pci-txe.c
View File

@ -42,13 +42,13 @@ static const struct pci_device_id mei_txe_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, mei_txe_pci_tbl); MODULE_DEVICE_TABLE(pci, mei_txe_pci_tbl);
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static inline void mei_txe_set_pm_domain(struct mei_device *dev); static inline void mei_txe_set_pm_domain(struct mei_device *dev);
static inline void mei_txe_unset_pm_domain(struct mei_device *dev); static inline void mei_txe_unset_pm_domain(struct mei_device *dev);
#else #else
static inline void mei_txe_set_pm_domain(struct mei_device *dev) {} static inline void mei_txe_set_pm_domain(struct mei_device *dev) {}
static inline void mei_txe_unset_pm_domain(struct mei_device *dev) {} static inline void mei_txe_unset_pm_domain(struct mei_device *dev) {}
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM */
static void mei_txe_pci_iounmap(struct pci_dev *pdev, struct mei_txe_hw *hw) static void mei_txe_pci_iounmap(struct pci_dev *pdev, struct mei_txe_hw *hw)
{ {
@ -295,7 +295,7 @@ static int mei_txe_pci_resume(struct device *device)
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
#ifdef CONFIG_PM_RUNTIME #ifdef CONFIG_PM
static int mei_txe_pm_runtime_idle(struct device *device) static int mei_txe_pm_runtime_idle(struct device *device)
{ {
struct pci_dev *pdev = to_pci_dev(device); struct pci_dev *pdev = to_pci_dev(device);
@ -401,9 +401,7 @@ static inline void mei_txe_unset_pm_domain(struct mei_device *dev)
/* stop using pm callbacks if any */ /* stop using pm callbacks if any */
dev->dev->pm_domain = NULL; dev->dev->pm_domain = NULL;
} }
#endif /* CONFIG_PM_RUNTIME */
#ifdef CONFIG_PM
static const struct dev_pm_ops mei_txe_pm_ops = { static const struct dev_pm_ops mei_txe_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(mei_txe_pci_suspend, SET_SYSTEM_SLEEP_PM_OPS(mei_txe_pci_suspend,
mei_txe_pci_resume) mei_txe_pci_resume)