Commit 8357f6fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more power management updates from Rafael Wysocki:
 "This is a continuation of the rework of device power management macros
  used for declaring device power management callbacks (Paul Cercueil)"

* tag 'pm-5.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  iio: pressure: bmp280: Use new PM macros
  PM: runtime: Add EXPORT[_GPL]_RUNTIME_DEV_PM_OPS macros
  PM: runtime: Add DEFINE_RUNTIME_DEV_PM_OPS() macro
  PM: core: Add EXPORT[_GPL]_SIMPLE_DEV_PM_OPS macros
  PM: core: Remove static qualifier in DEFINE_SIMPLE_DEV_PM_OPS macro
  PM: core: Remove DEFINE_UNIVERSAL_DEV_PM_OPS() macro
parents 6a8d7fbf 5865918f

drivers/iio/pressure/bmp280-core.c

+2 −9
Original line number Diff line number Diff line
@@ -1138,7 +1138,6 @@ int bmp280_common_probe(struct device *dev, 
}

EXPORT_SYMBOL(bmp280_common_probe);



#ifdef CONFIG_PM

static int bmp280_runtime_suspend(struct device *dev)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);
@@ -1159,15 +1158,9 @@ static int bmp280_runtime_resume(struct device *dev) 
	usleep_range(data->start_up_time, data->start_up_time + 100);

	return data->chip_info->chip_config(data);

}

#endif /* CONFIG_PM */



const struct dev_pm_ops bmp280_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(bmp280_runtime_suspend,

			   bmp280_runtime_resume, NULL)

};

EXPORT_SYMBOL(bmp280_dev_pm_ops);

EXPORT_RUNTIME_DEV_PM_OPS(bmp280_dev_pm_ops, bmp280_runtime_suspend,

			  bmp280_runtime_resume, NULL);



MODULE_AUTHOR("Vlad Dogaru <vlad.dogaru@intel.com>");

MODULE_DESCRIPTION("Driver for Bosch Sensortec BMP180/BMP280 pressure and temperature sensor");

drivers/iio/pressure/bmp280-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static struct i2c_driver bmp280_i2c_driver = { 
	.driver = {

		.name	= "bmp280",

		.of_match_table = bmp280_of_i2c_match,

		.pm = &bmp280_dev_pm_ops,

		.pm = pm_ptr(&bmp280_dev_pm_ops),

	},

	.probe		= bmp280_i2c_probe,

	.id_table	= bmp280_i2c_id,

drivers/iio/pressure/bmp280-spi.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static struct spi_driver bmp280_spi_driver = { 
	.driver = {

		.name = "bmp280",

		.of_match_table = bmp280_of_spi_match,

		.pm = &bmp280_dev_pm_ops,

		.pm = pm_ptr(&bmp280_dev_pm_ops),

	},

	.id_table = bmp280_spi_id,

	.probe = bmp280_spi_probe,

drivers/mmc/host/jz4740_mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ static int jz4740_mmc_resume(struct device *dev) 
	return pinctrl_select_default_state(dev);

}



DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,

static DEFINE_SIMPLE_DEV_PM_OPS(jz4740_mmc_pm_ops, jz4740_mmc_suspend,

				jz4740_mmc_resume);



static struct platform_driver jz4740_mmc_driver = {

drivers/mmc/host/mxcmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ static int mxcmci_resume(struct device *dev) 
	return ret;

}



DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);

static DEFINE_SIMPLE_DEV_PM_OPS(mxcmci_pm_ops, mxcmci_suspend, mxcmci_resume);



static struct platform_driver mxcmci_driver = {

	.probe		= mxcmci_probe,