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

Commit bbd6d050 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

misc / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM 



After commit b2b49ccb (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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e243c7c1

drivers/misc/apds990x.c

+2 −2
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ static int apds990x_detect(struct apds990x_chip *chip) 
	return ret;

}



#if defined(CONFIG_PM) || defined(CONFIG_PM_RUNTIME)

#ifdef CONFIG_PM

static int apds990x_chip_on(struct apds990x_chip *chip)

{

	int err	 = regulator_bulk_enable(ARRAY_SIZE(chip->regs),
@@ -1237,7 +1237,7 @@ static int apds990x_resume(struct device *dev) 
}

#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int apds990x_runtime_suspend(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

drivers/misc/bh1770glc.c

+1 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,7 @@ static int bh1770_resume(struct device *dev) 
}

#endif



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int bh1770_runtime_suspend(struct device *dev)

{

	struct i2c_client *client = container_of(dev, struct i2c_client, dev);

drivers/misc/lis3lv02d/lis3lv02d_i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static int lis3lv02d_i2c_resume(struct device *dev) 
}

#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int lis3_i2c_runtime_suspend(struct device *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);

	return 0;

}

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



static const struct i2c_device_id lis3lv02d_id[] = {

	{"lis3lv02d", LIS3LV02D},

drivers/misc/mei/mei_dev.h

+2 −2
Original line number Diff line number Diff line
@@ -530,9 +530,9 @@ struct mei_device { 
	 * Power Gating support

	 */

	enum mei_pg_event pg_event;

#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

	struct dev_pm_domain pg_domain;

#endif /* CONFIG_PM_RUNTIME */

#endif /* CONFIG_PM */



	unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE];

	u32 rd_msg_hdr;

drivers/misc/mei/pci-me.c

+3 −5
Original line number Diff line number Diff line
@@ -89,13 +89,13 @@ static const struct pci_device_id 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_unset_pm_domain(struct mei_device *dev);

#else

static inline void mei_me_set_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
@@ -357,7 +357,7 @@ static int mei_me_pci_resume(struct device *device) 
}

#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int mei_me_pm_runtime_idle(struct device *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 */

	dev->dev->pm_domain = NULL;

}

#endif /* CONFIG_PM_RUNTIME */



#ifdef CONFIG_PM

static const struct dev_pm_ops mei_me_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(mei_me_pci_suspend,

				mei_me_pci_resume)