Commit 144ff5e0 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Dmitry Torokhov
Browse files

Input: ipaq-micro-ts - use DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() 



This driver never used the older SIMPLE_DEV_PM_OPS() but instead just
set two of the callbacks directly.  Skip that deprecated macro and go
straight to the new form that avoids the need for guarding or marking
callbacks __maybe_unused.

--
It is possible there is some subtle reason why only two of the
callbacks normally set by SIMPLE_DEV_PM_OPS() are set. As such,
this one needs some closer reading than many of the others.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230102181842.718010-70-jic23@kernel.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 61df952b

drivers/input/touchscreen/ipaq-micro-ts.c

+5 −6
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int micro_ts_probe(struct platform_device *pdev) 
	return 0;

}



static int __maybe_unused micro_ts_suspend(struct device *dev)

static int micro_ts_suspend(struct device *dev)

{

	struct touchscreen_data *ts = dev_get_drvdata(dev);
@@ -128,7 +128,7 @@ static int __maybe_unused micro_ts_suspend(struct device *dev) 
	return 0;

}



static int __maybe_unused micro_ts_resume(struct device *dev)

static int micro_ts_resume(struct device *dev)

{

	struct touchscreen_data *ts = dev_get_drvdata(dev);

	struct input_dev *input = ts->input;
@@ -143,14 +143,13 @@ static int __maybe_unused micro_ts_resume(struct device *dev) 
	return 0;

}



static const struct dev_pm_ops micro_ts_dev_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(micro_ts_suspend, micro_ts_resume)

};

static DEFINE_SIMPLE_DEV_PM(micro_ts_dev_pm_ops,

			    micro_ts_suspend, micro_ts_resume);



static struct platform_driver micro_ts_device_driver = {

	.driver	= {

		.name	= "ipaq-micro-ts",

		.pm	= &micro_ts_dev_pm_ops,

		.pm	= pm_sleep_ptr(&micro_ts_dev_pm_ops),

	},

	.probe	= micro_ts_probe,

};