diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2022-01-30 19:31:15 +0000 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2022-02-18 11:45:29 +0000 |
| commit | 2f2207a6e6aa6dd169b14765b30396f37287ecc6 (patch) | |
| tree | 298b712bb2ed9f4fb91635c23685a912d1f26355 /drivers/iio/light/apds9300.c | |
| parent | 90b8c2c8f9f53a980d49081798080352aca69deb (diff) | |
| download | linux-stable-2f2207a6e6aa6dd169b14765b30396f37287ecc6.tar.gz linux-stable-2f2207a6e6aa6dd169b14765b30396f37287ecc6.tar.bz2 linux-stable-2f2207a6e6aa6dd169b14765b30396f37287ecc6.zip | |
iio:light:apds9300: 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: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20220130193147.279148-19-jic23@kernel.org
Diffstat (limited to 'drivers/iio/light/apds9300.c')
| -rw-r--r-- | drivers/iio/light/apds9300.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/iio/light/apds9300.c b/drivers/iio/light/apds9300.c index baaf202dce05..0f9d77598997 100644 --- a/drivers/iio/light/apds9300.c +++ b/drivers/iio/light/apds9300.c @@ -466,7 +466,6 @@ static int apds9300_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM_SLEEP static int apds9300_suspend(struct device *dev) { struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); @@ -493,11 +492,8 @@ static int apds9300_resume(struct device *dev) return ret; } -static SIMPLE_DEV_PM_OPS(apds9300_pm_ops, apds9300_suspend, apds9300_resume); -#define APDS9300_PM_OPS (&apds9300_pm_ops) -#else -#define APDS9300_PM_OPS NULL -#endif +static DEFINE_SIMPLE_DEV_PM_OPS(apds9300_pm_ops, apds9300_suspend, + apds9300_resume); static const struct i2c_device_id apds9300_id[] = { { APDS9300_DRV_NAME, 0 }, @@ -509,7 +505,7 @@ MODULE_DEVICE_TABLE(i2c, apds9300_id); static struct i2c_driver apds9300_driver = { .driver = { .name = APDS9300_DRV_NAME, - .pm = APDS9300_PM_OPS, + .pm = pm_sleep_ptr(&apds9300_pm_ops), }, .probe = apds9300_probe, .remove = apds9300_remove, |