Commit 4a96b4e2 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:temperature:mlx90614: Switch from CONFIG_PM* guards to pm_ptr() etc

Letting the compiler remove these functions when the kernel is built
without one or  more of CONFIG_PM/CONFIG_PM_SLEEP support is simpler and
less error prone than the use of #ifdef based config guards.

Removing instances of this approach from IIO also stops them being
copied into new drivers.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Crt Mori <cmo@melexis.com>
Reviewed-by: default avatarCrt Mori <cmo@melexis.com>
Reviewed-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20220130193147.279148-43-jic23@kernel.org
parent da123e29
...@@ -600,7 +600,6 @@ static const struct of_device_id mlx90614_of_match[] = { ...@@ -600,7 +600,6 @@ static const struct of_device_id mlx90614_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, mlx90614_of_match); MODULE_DEVICE_TABLE(of, mlx90614_of_match);
#ifdef CONFIG_PM_SLEEP
static int mlx90614_pm_suspend(struct device *dev) static int mlx90614_pm_suspend(struct device *dev)
{ {
struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
...@@ -630,9 +629,7 @@ static int mlx90614_pm_resume(struct device *dev) ...@@ -630,9 +629,7 @@ static int mlx90614_pm_resume(struct device *dev)
return 0; return 0;
} }
#endif
#ifdef CONFIG_PM
static int mlx90614_pm_runtime_suspend(struct device *dev) static int mlx90614_pm_runtime_suspend(struct device *dev)
{ {
struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
...@@ -648,11 +645,10 @@ static int mlx90614_pm_runtime_resume(struct device *dev) ...@@ -648,11 +645,10 @@ static int mlx90614_pm_runtime_resume(struct device *dev)
return mlx90614_wakeup(data); return mlx90614_wakeup(data);
} }
#endif
static const struct dev_pm_ops mlx90614_pm_ops = { static const struct dev_pm_ops mlx90614_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(mlx90614_pm_suspend, mlx90614_pm_resume) SYSTEM_SLEEP_PM_OPS(mlx90614_pm_suspend, mlx90614_pm_resume)
SET_RUNTIME_PM_OPS(mlx90614_pm_runtime_suspend, RUNTIME_PM_OPS(mlx90614_pm_runtime_suspend,
mlx90614_pm_runtime_resume, NULL) mlx90614_pm_runtime_resume, NULL)
}; };
...@@ -660,7 +656,7 @@ static struct i2c_driver mlx90614_driver = { ...@@ -660,7 +656,7 @@ static struct i2c_driver mlx90614_driver = {
.driver = { .driver = {
.name = "mlx90614", .name = "mlx90614",
.of_match_table = mlx90614_of_match, .of_match_table = mlx90614_of_match,
.pm = &mlx90614_pm_ops, .pm = pm_ptr(&mlx90614_pm_ops),
}, },
.probe = mlx90614_probe, .probe = mlx90614_probe,
.remove = mlx90614_remove, .remove = mlx90614_remove,
......
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