Input: pxspad - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()

SIMPLE_DEV_PM_OPS() is deprecated as it requires explicit protection
against used 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>
Link: https://lore.kernel.org/r/20221204180841.2211588-2-jic23@kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jonathan Cameron 2022-12-04 18:08:10 +00:00 коммит произвёл Dmitry Torokhov
Родитель 56232e933d
Коммит f3183157cf
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -371,7 +371,7 @@ static int psxpad_spi_probe(struct spi_device *spi)
return 0; return 0;
} }
static int __maybe_unused psxpad_spi_suspend(struct device *dev) static int psxpad_spi_suspend(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev); struct spi_device *spi = to_spi_device(dev);
struct psxpad *pad = spi_get_drvdata(spi); struct psxpad *pad = spi_get_drvdata(spi);
@ -381,7 +381,7 @@ static int __maybe_unused psxpad_spi_suspend(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(psxpad_spi_pm, psxpad_spi_suspend, NULL); static DEFINE_SIMPLE_DEV_PM_OPS(psxpad_spi_pm, psxpad_spi_suspend, NULL);
static const struct spi_device_id psxpad_spi_id[] = { static const struct spi_device_id psxpad_spi_id[] = {
{ "psxpad-spi", 0 }, { "psxpad-spi", 0 },
@ -392,7 +392,7 @@ MODULE_DEVICE_TABLE(spi, psxpad_spi_id);
static struct spi_driver psxpad_spi_driver = { static struct spi_driver psxpad_spi_driver = {
.driver = { .driver = {
.name = "psxpad-spi", .name = "psxpad-spi",
.pm = &psxpad_spi_pm, .pm = pm_sleep_ptr(&psxpad_spi_pm),
}, },
.id_table = psxpad_spi_id, .id_table = psxpad_spi_id,
.probe = psxpad_spi_probe, .probe = psxpad_spi_probe,