Input: wdt87xx_i2c - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
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: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20230102181842.718010-66-jic23@kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
committed by
Dmitry Torokhov
parent
5ca74320a7
commit
fa8d5a6e71
@@ -1113,7 +1113,7 @@ static int wdt87xx_ts_probe(struct i2c_client *client)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused wdt87xx_suspend(struct device *dev)
|
||||
static int wdt87xx_suspend(struct device *dev)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
int error;
|
||||
@@ -1132,7 +1132,7 @@ static int __maybe_unused wdt87xx_suspend(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused wdt87xx_resume(struct device *dev)
|
||||
static int wdt87xx_resume(struct device *dev)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
int error;
|
||||
@@ -1154,7 +1154,7 @@ static int __maybe_unused wdt87xx_resume(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(wdt87xx_pm_ops, wdt87xx_suspend, wdt87xx_resume);
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(wdt87xx_pm_ops, wdt87xx_suspend, wdt87xx_resume);
|
||||
|
||||
static const struct i2c_device_id wdt87xx_dev_id[] = {
|
||||
{ WDT87XX_NAME, 0 },
|
||||
@@ -1173,7 +1173,7 @@ static struct i2c_driver wdt87xx_driver = {
|
||||
.id_table = wdt87xx_dev_id,
|
||||
.driver = {
|
||||
.name = WDT87XX_NAME,
|
||||
.pm = &wdt87xx_pm_ops,
|
||||
.pm = pm_sleep_ptr(&wdt87xx_pm_ops),
|
||||
.acpi_match_table = ACPI_PTR(wdt87xx_acpi_id),
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user