niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

iio:temperature:tmp007: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() etc

Browse source 
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.

Acked-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20220130193147.279148-38-jic23@kernel.org
This commit is contained in:
Jonathan Cameron 2022-01-30 19:31:34 +00:00
parent 1ef7361fec
commit ce83415d90
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/iio/temperature/tmp007.c
View file

@ -537,7 +537,6 @@ static int tmp007_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 tmp007_suspend(struct device *dev) static int tmp007_suspend(struct device *dev)
{ {
struct tmp007_data *data = iio_priv(i2c_get_clientdata( struct tmp007_data *data = iio_priv(i2c_get_clientdata(
@ -554,9 +553,8 @@ static int tmp007_resume(struct device *dev)
return i2c_smbus_write_word_swapped(data->client, TMP007_CONFIG, return i2c_smbus_write_word_swapped(data->client, TMP007_CONFIG,
data->config | TMP007_CONFIG_CONV_EN); data->config | TMP007_CONFIG_CONV_EN);
} }
#endif
static SIMPLE_DEV_PM_OPS(tmp007_pm_ops, tmp007_suspend, tmp007_resume); static DEFINE_SIMPLE_DEV_PM_OPS(tmp007_pm_ops, tmp007_suspend, tmp007_resume);
static const struct of_device_id tmp007_of_match[] = { static const struct of_device_id tmp007_of_match[] = {
{ .compatible = "ti,tmp007", }, { .compatible = "ti,tmp007", },
@ -574,7 +572,7 @@ static struct i2c_driver tmp007_driver = {
.driver = { .driver = {
.name = "tmp007", .name = "tmp007",
.of_match_table = tmp007_of_match, .of_match_table = tmp007_of_match,
.pm = &tmp007_pm_ops, .pm = pm_sleep_ptr(&tmp007_pm_ops),
}, },
.probe = tmp007_probe, .probe = tmp007_probe,
.id_table = tmp007_id, .id_table = tmp007_id,