Commit ff9231c7 authored by Jonathan Cameron's avatar Jonathan Cameron

iio:accel:da280: 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.
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-3-jic23@kernel.org
parent 5d0e9e22
...@@ -153,7 +153,6 @@ static int da280_probe(struct i2c_client *client, ...@@ -153,7 +153,6 @@ static int da280_probe(struct i2c_client *client,
return devm_iio_device_register(&client->dev, indio_dev); return devm_iio_device_register(&client->dev, indio_dev);
} }
#ifdef CONFIG_PM_SLEEP
static int da280_suspend(struct device *dev) static int da280_suspend(struct device *dev)
{ {
return da280_enable(to_i2c_client(dev), false); return da280_enable(to_i2c_client(dev), false);
...@@ -163,9 +162,8 @@ static int da280_resume(struct device *dev) ...@@ -163,9 +162,8 @@ static int da280_resume(struct device *dev)
{ {
return da280_enable(to_i2c_client(dev), true); return da280_enable(to_i2c_client(dev), true);
} }
#endif
static SIMPLE_DEV_PM_OPS(da280_pm_ops, da280_suspend, da280_resume); static DEFINE_SIMPLE_DEV_PM_OPS(da280_pm_ops, da280_suspend, da280_resume);
static const struct acpi_device_id da280_acpi_match[] = { static const struct acpi_device_id da280_acpi_match[] = {
{"MIRAACC", da280}, {"MIRAACC", da280},
...@@ -184,7 +182,7 @@ static struct i2c_driver da280_driver = { ...@@ -184,7 +182,7 @@ static struct i2c_driver da280_driver = {
.driver = { .driver = {
.name = "da280", .name = "da280",
.acpi_match_table = ACPI_PTR(da280_acpi_match), .acpi_match_table = ACPI_PTR(da280_acpi_match),
.pm = &da280_pm_ops, .pm = pm_sleep_ptr(&da280_pm_ops),
}, },
.probe = da280_probe, .probe = da280_probe,
.id_table = da280_i2c_id, .id_table = da280_i2c_id,
......
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