| Message ID | 20230102181842.718010-10-jic23@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 238e5de40c3632b0a426fe69911d708b58820521 |
| Headers | show |
| Series | Input: Switch to DEFINE_SIMPLE_DEV_PM_OP() set 2 | expand |
On Mon, Jan 02, 2023 at 06:17:42PM +0000, Jonathan Cameron wrote: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > SIMPLE_DEV_PM_OPS() is deprecated as it requires explicit protection > against unused function warnings. The new combination of pm_sleep_ptr() > and DEFINE_SIMPLE_DEV_PM_OPS() allows the compiler to see the functions, > thus suppressing the warning, but still allowing the unused code to be > removed. Thus also drop the __maybe_unused markings. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Jeff LaBundy <jeff@labundy.com> > --- > drivers/input/misc/iqs626a.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/misc/iqs626a.c b/drivers/input/misc/iqs626a.c > index 23b5dd9552dc..4727e6b95e41 100644 > --- a/drivers/input/misc/iqs626a.c > +++ b/drivers/input/misc/iqs626a.c > @@ -1712,7 +1712,7 @@ static int iqs626_probe(struct i2c_client *client) > return error; > } > > -static int __maybe_unused iqs626_suspend(struct device *dev) > +static int iqs626_suspend(struct device *dev) > { > struct iqs626_private *iqs626 = dev_get_drvdata(dev); > struct i2c_client *client = iqs626->client; > @@ -1771,7 +1771,7 @@ static int __maybe_unused iqs626_suspend(struct device *dev) > return error; > } > > -static int __maybe_unused iqs626_resume(struct device *dev) > +static int iqs626_resume(struct device *dev) > { > struct iqs626_private *iqs626 = dev_get_drvdata(dev); > struct i2c_client *client = iqs626->client; > @@ -1818,7 +1818,7 @@ static int __maybe_unused iqs626_resume(struct device *dev) > return error; > } > > -static SIMPLE_DEV_PM_OPS(iqs626_pm, iqs626_suspend, iqs626_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(iqs626_pm, iqs626_suspend, iqs626_resume); > > static const struct of_device_id iqs626_of_match[] = { > { .compatible = "azoteq,iqs626a" }, > @@ -1830,7 +1830,7 @@ static struct i2c_driver iqs626_i2c_driver = { > .driver = { > .name = "iqs626a", > .of_match_table = iqs626_of_match, > - .pm = &iqs626_pm, > + .pm = pm_sleep_ptr(&iqs626_pm), > }, > .probe_new = iqs626_probe, > }; > -- > 2.39.0 >
diff --git a/drivers/input/misc/iqs626a.c b/drivers/input/misc/iqs626a.c index 23b5dd9552dc..4727e6b95e41 100644 --- a/drivers/input/misc/iqs626a.c +++ b/drivers/input/misc/iqs626a.c @@ -1712,7 +1712,7 @@ static int iqs626_probe(struct i2c_client *client) return error; } -static int __maybe_unused iqs626_suspend(struct device *dev) +static int iqs626_suspend(struct device *dev) { struct iqs626_private *iqs626 = dev_get_drvdata(dev); struct i2c_client *client = iqs626->client; @@ -1771,7 +1771,7 @@ static int __maybe_unused iqs626_suspend(struct device *dev) return error; } -static int __maybe_unused iqs626_resume(struct device *dev) +static int iqs626_resume(struct device *dev) { struct iqs626_private *iqs626 = dev_get_drvdata(dev); struct i2c_client *client = iqs626->client; @@ -1818,7 +1818,7 @@ static int __maybe_unused iqs626_resume(struct device *dev) return error; } -static SIMPLE_DEV_PM_OPS(iqs626_pm, iqs626_suspend, iqs626_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(iqs626_pm, iqs626_suspend, iqs626_resume); static const struct of_device_id iqs626_of_match[] = { { .compatible = "azoteq,iqs626a" }, @@ -1830,7 +1830,7 @@ static struct i2c_driver iqs626_i2c_driver = { .driver = { .name = "iqs626a", .of_match_table = iqs626_of_match, - .pm = &iqs626_pm, + .pm = pm_sleep_ptr(&iqs626_pm), }, .probe_new = iqs626_probe, };