All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: linux-input@vger.kernel.org, Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>,
	Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 69/69] Input: ipaq-micro-ts - use DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
Date: Mon,  2 Jan 2023 18:18:42 +0000	[thread overview]
Message-ID: <20230102181842.718010-70-jic23@kernel.org> (raw)
In-Reply-To: <20230102181842.718010-1-jic23@kernel.org>

From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

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.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
--
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.
---
 drivers/input/touchscreen/ipaq-micro-ts.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/input/touchscreen/ipaq-micro-ts.c b/drivers/input/touchscreen/ipaq-micro-ts.c
index 0eb5689fe65f..d8e25b502968 100644
--- a/drivers/input/touchscreen/ipaq-micro-ts.c
+++ b/drivers/input/touchscreen/ipaq-micro-ts.c
@@ -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,
 };
-- 
2.39.0


  parent reply	other threads:[~2023-01-02 18:07 UTC|newest]

Thread overview: 89+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-02 18:17 [PATCH 00/69] Input: Switch to DEFINE_SIMPLE_DEV_PM_OP() set 2 Jonathan Cameron
2023-01-02 18:17 ` [PATCH 01/69] Input: 88pm860x - switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Jonathan Cameron
2023-01-02 18:17 ` [PATCH 02/69] Input: da7280 " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 03/69] Input: drv260x " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 04/69] Input: drv2665 " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 05/69] Input: drv2667 " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 06/69] Input: e3x0-button " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 07/69] Input: gpio-vibra " Jonathan Cameron
2023-01-02 19:30   ` Luca Weiss
2023-01-02 18:17 ` [PATCH 08/69] Input: iqs269a " Jonathan Cameron
2023-01-03 18:14   ` Jeff LaBundy
2023-01-02 18:17 ` [PATCH 09/69] Input: iqs626a " Jonathan Cameron
2023-01-03 18:14   ` Jeff LaBundy
2023-01-02 18:17 ` [PATCH 10/69] Input: kxtj9 " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 11/69] Input: max77693-haptic " Jonathan Cameron
2023-01-03  7:54   ` Krzysztof Kozlowski
2023-01-02 18:17 ` [PATCH 12/69] Input: max8925_onkey " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 13/69] Input: max8997_haptic " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 14/69] Input: palmas-pwrbutton " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 15/69] Input: pcfg8574_keypad " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 16/69] Input: pm8941-pwrkey " Jonathan Cameron
2023-01-04  1:01   ` Stephen Boyd
2023-01-02 18:17 ` [PATCH 17/69] Input: pm8xxx-vibrator " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 18/69] Input: pmic8xxx-pwrkey " Jonathan Cameron
2023-01-04  1:02   ` Stephen Boyd
2023-01-02 18:17 ` [PATCH 19/69] Input: pwm-beeper " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 20/69] Input: pwm-vibra " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 21/69] Input: regulator-haptic " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 22/69] Input: rotary-encoder " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 23/69] Input: stpmic1_onekey " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 24/69] Input: twl4030-vibra " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 25/69] Input: twl6030-vibra " Jonathan Cameron
2023-01-02 18:17 ` [PATCH 26/69] Input: elan_i2c_core " Jonathan Cameron
2023-01-09  8:44   ` Hans de Goede
2023-01-02 18:18 ` [PATCH 27/69] Input: navpoint " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 28/69] Input: synaptics_i2c " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 29/69] Input: ambakmi " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 30/69] Input: ad7877 " Jonathan Cameron
2023-01-09 10:18   ` Hennerich, Michael
2023-01-02 18:18 ` [PATCH 31/69] Input: ads7846 " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 32/69] Input: ar1021 " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 33/69] Input: atmel_mxt_ts " Jonathan Cameron
2023-01-03  8:45   ` Claudiu.Beznea
2023-01-02 18:18 ` [PATCH 34/69] Input: auo-pixcir-ts " Jonathan Cameron
2023-01-04 10:33   ` Heiko Stübner
2023-01-02 18:18 ` [PATCH 35/69] Input: bu21013_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 36/69] Input: bu21029 " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 37/69] Input: chipone_in8318 " Jonathan Cameron
2023-01-09  8:44   ` Hans de Goede
2023-01-02 18:18 ` [PATCH 38/69] Input: chipone_icn8505 " Jonathan Cameron
2023-01-09  8:44   ` Hans de Goede
2023-01-02 18:18 ` [PATCH 39/69] Input: cy8ctma140 " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 40/69] Input: cy8ctmg110_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 41/69] Input: edt-ft5x06 " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 42/69] Input: eeti_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 43/69] Input: egalax_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 44/69] input: ektf2127 " Jonathan Cameron
2023-01-09  8:44   ` Hans de Goede
2023-01-02 18:18 ` [PATCH 45/69] Input: elants_i2c " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 46/69] Input: goodix " Jonathan Cameron
2023-01-09  8:45   ` Hans de Goede
2023-01-02 18:18 ` [PATCH 47/69] Input: hideep " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 48/69] Input: ilitek_ts_i2c " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 49/69] Input: imagis " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 50/69] Input: imx6ul_tsc " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 51/69] Input: iqs5xx " Jonathan Cameron
2023-01-03 18:15   ` Jeff LaBundy
2023-01-02 18:18 ` [PATCH 52/69] Input: mcs5000_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 53/69] Input: melfas_mip4 " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 54/69] input: migor_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 55/69] Input: mms114 " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 56/69] Input: msg2638 " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 57/69] Input: pixcir_i2c_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 58/69] Input: raydium_i2c_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 59/69] Input: silead " Jonathan Cameron
2023-01-09  8:45   ` Hans de Goede
2023-01-02 18:18 ` [PATCH 60/69] Input: st1232 " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 61/69] Input: surface3_spi " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 62/69] Input: ti_am335x_tsc " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 63/69] Input: ucb1400_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 64/69] Input: wacom_i2c " Jonathan Cameron
2023-01-03 10:39   ` Alistair
2023-01-02 18:18 ` [PATCH 65/69] Input: wdt87xx_i2c " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 66/69] Input: wm97xx " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 67/69] Input: zforce_ts " Jonathan Cameron
2023-01-02 18:18 ` [PATCH 68/69] Input: zinitix " Jonathan Cameron
2023-01-02 18:18 ` Jonathan Cameron [this message]
2023-01-04  0:01 ` [PATCH 00/69] Input: Switch to DEFINE_SIMPLE_DEV_PM_OP() set 2 Linus Walleij
2023-01-11  0:54 ` Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230102181842.718010-70-jic23@kernel.org \
    --to=jic23@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-input@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.