Commit fce55da3 authored by Alain Volmat's avatar Alain Volmat Committed by Wolfram Sang

i2c: st: use pm_sleep_ptr to avoid ifdef CONFIG_PM_SLEEP

Rely on pm_sleep_ptr when setting the pm ops and get rid
of the ifdef CONFIG_PM_SLEEP around suspend/resume functions.
Signed-off-by: default avatarAlain Volmat <avolmat@me.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 001e944f
...@@ -740,7 +740,6 @@ static int st_i2c_xfer(struct i2c_adapter *i2c_adap, ...@@ -740,7 +740,6 @@ static int st_i2c_xfer(struct i2c_adapter *i2c_adap,
return (ret < 0) ? ret : i; return (ret < 0) ? ret : i;
} }
#ifdef CONFIG_PM_SLEEP
static int st_i2c_suspend(struct device *dev) static int st_i2c_suspend(struct device *dev)
{ {
struct st_i2c_dev *i2c_dev = dev_get_drvdata(dev); struct st_i2c_dev *i2c_dev = dev_get_drvdata(dev);
...@@ -762,11 +761,7 @@ static int st_i2c_resume(struct device *dev) ...@@ -762,11 +761,7 @@ static int st_i2c_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(st_i2c_pm, st_i2c_suspend, st_i2c_resume); static DEFINE_SIMPLE_DEV_PM_OPS(st_i2c_pm, st_i2c_suspend, st_i2c_resume);
#define ST_I2C_PM (&st_i2c_pm)
#else
#define ST_I2C_PM NULL
#endif
static u32 st_i2c_func(struct i2c_adapter *adap) static u32 st_i2c_func(struct i2c_adapter *adap)
{ {
...@@ -901,7 +896,7 @@ static struct platform_driver st_i2c_driver = { ...@@ -901,7 +896,7 @@ static struct platform_driver st_i2c_driver = {
.driver = { .driver = {
.name = "st-i2c", .name = "st-i2c",
.of_match_table = st_i2c_match, .of_match_table = st_i2c_match,
.pm = ST_I2C_PM, .pm = pm_sleep_ptr(&st_i2c_pm),
}, },
.probe = st_i2c_probe, .probe = st_i2c_probe,
.remove = st_i2c_remove, .remove = st_i2c_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