Commit 5865918f authored by Paul Cercueil's avatar Paul Cercueil Committed by Rafael J. Wysocki

iio: pressure: bmp280: Use new PM macros

Use the new EXPORT_RUNTIME_DEV_PM_OPS() macro. It allows the underlying
dev_pm_ops struct as well as the suspend/resume callbacks to be detected
as dead code in the case where CONFIG_PM is disabled, without having to
wrap everything inside #ifdef CONFIG_PM guards.
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d59ff7d9
...@@ -1138,7 +1138,6 @@ int bmp280_common_probe(struct device *dev, ...@@ -1138,7 +1138,6 @@ int bmp280_common_probe(struct device *dev,
} }
EXPORT_SYMBOL(bmp280_common_probe); EXPORT_SYMBOL(bmp280_common_probe);
#ifdef CONFIG_PM
static int bmp280_runtime_suspend(struct device *dev) static int bmp280_runtime_suspend(struct device *dev)
{ {
struct iio_dev *indio_dev = dev_get_drvdata(dev); struct iio_dev *indio_dev = dev_get_drvdata(dev);
...@@ -1159,15 +1158,9 @@ static int bmp280_runtime_resume(struct device *dev) ...@@ -1159,15 +1158,9 @@ static int bmp280_runtime_resume(struct device *dev)
usleep_range(data->start_up_time, data->start_up_time + 100); usleep_range(data->start_up_time, data->start_up_time + 100);
return data->chip_info->chip_config(data); return data->chip_info->chip_config(data);
} }
#endif /* CONFIG_PM */
const struct dev_pm_ops bmp280_dev_pm_ops = { EXPORT_RUNTIME_DEV_PM_OPS(bmp280_dev_pm_ops, bmp280_runtime_suspend,
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, bmp280_runtime_resume, NULL);
pm_runtime_force_resume)
SET_RUNTIME_PM_OPS(bmp280_runtime_suspend,
bmp280_runtime_resume, NULL)
};
EXPORT_SYMBOL(bmp280_dev_pm_ops);
MODULE_AUTHOR("Vlad Dogaru <vlad.dogaru@intel.com>"); MODULE_AUTHOR("Vlad Dogaru <vlad.dogaru@intel.com>");
MODULE_DESCRIPTION("Driver for Bosch Sensortec BMP180/BMP280 pressure and temperature sensor"); MODULE_DESCRIPTION("Driver for Bosch Sensortec BMP180/BMP280 pressure and temperature sensor");
......
...@@ -58,7 +58,7 @@ static struct i2c_driver bmp280_i2c_driver = { ...@@ -58,7 +58,7 @@ static struct i2c_driver bmp280_i2c_driver = {
.driver = { .driver = {
.name = "bmp280", .name = "bmp280",
.of_match_table = bmp280_of_i2c_match, .of_match_table = bmp280_of_i2c_match,
.pm = &bmp280_dev_pm_ops, .pm = pm_ptr(&bmp280_dev_pm_ops),
}, },
.probe = bmp280_i2c_probe, .probe = bmp280_i2c_probe,
.id_table = bmp280_i2c_id, .id_table = bmp280_i2c_id,
......
...@@ -109,7 +109,7 @@ static struct spi_driver bmp280_spi_driver = { ...@@ -109,7 +109,7 @@ static struct spi_driver bmp280_spi_driver = {
.driver = { .driver = {
.name = "bmp280", .name = "bmp280",
.of_match_table = bmp280_of_spi_match, .of_match_table = bmp280_of_spi_match,
.pm = &bmp280_dev_pm_ops, .pm = pm_ptr(&bmp280_dev_pm_ops),
}, },
.id_table = bmp280_spi_id, .id_table = bmp280_spi_id,
.probe = bmp280_spi_probe, .probe = bmp280_spi_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment