Commit 51e256d4 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:proximity:sx9500: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() etc

Letting the compiler remove these functions when the kernel is built
without 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.
Reviewed-by: default avatarGwendal Grignou <gwendal@chromium.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20220130193147.279148-36-jic23@kernel.org
parent fe895d25
...@@ -993,7 +993,6 @@ static int sx9500_remove(struct i2c_client *client) ...@@ -993,7 +993,6 @@ static int sx9500_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int sx9500_suspend(struct device *dev) static int sx9500_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));
...@@ -1030,11 +1029,8 @@ static int sx9500_resume(struct device *dev) ...@@ -1030,11 +1029,8 @@ static int sx9500_resume(struct device *dev)
return ret; return ret;
} }
#endif /* CONFIG_PM_SLEEP */
static const struct dev_pm_ops sx9500_pm_ops = { static DEFINE_SIMPLE_DEV_PM_OPS(sx9500_pm_ops, sx9500_suspend, sx9500_resume);
SET_SYSTEM_SLEEP_PM_OPS(sx9500_suspend, sx9500_resume)
};
static const struct acpi_device_id sx9500_acpi_match[] = { static const struct acpi_device_id sx9500_acpi_match[] = {
{"SSX9500", 0}, {"SSX9500", 0},
...@@ -1060,7 +1056,7 @@ static struct i2c_driver sx9500_driver = { ...@@ -1060,7 +1056,7 @@ static struct i2c_driver sx9500_driver = {
.name = SX9500_DRIVER_NAME, .name = SX9500_DRIVER_NAME,
.acpi_match_table = ACPI_PTR(sx9500_acpi_match), .acpi_match_table = ACPI_PTR(sx9500_acpi_match),
.of_match_table = of_match_ptr(sx9500_of_match), .of_match_table = of_match_ptr(sx9500_of_match),
.pm = &sx9500_pm_ops, .pm = pm_sleep_ptr(&sx9500_pm_ops),
}, },
.probe = sx9500_probe, .probe = sx9500_probe,
.remove = sx9500_remove, .remove = sx9500_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