Linux Hardware Monitor development
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Jean Delvare <jdelvare@suse.com>,
	Guenter Roeck <linux@roeck-us.net>,
	linux-hwmon@vger.kernel.org
Cc: "Paul Cercueil" <paul@crapouillou.net>,
	"Hans de Goede" <hdegoede@redhat.com>,
	"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
	"Lars-Peter Clausen" <lars@metafoo.de>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	"Nuno Sá" <nuno.sa@analog.com>,
	"Roland Stigge" <stigge@antcom.de>,
	"Zoltán Kővágó" <dirty.ice.hu@gmail.com>,
	"Ninad Malwade" <nmalwade@nvidia.com>,
	"Jonathan Cameron" <Jonathan.Cameron@huawei.com>
Subject: [PATCH 12/18] hwmon: (nct6775) Switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()
Date: Sun, 25 Sep 2022 18:27:53 +0100	[thread overview]
Message-ID: <20220925172759.3573439-13-jic23@kernel.org> (raw)
In-Reply-To: <20220925172759.3573439-1-jic23@kernel.org>

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

These newer PM macros allow the compiler to see what code it can remove
if !CONFIG_PM_SLEEP. This allows the removal of __maybe_unused markings
whilst achieving the same result.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Zoltán Kővágó <dirty.ice.hu@gmail.com>
---
 drivers/hwmon/nct6775-platform.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c
index 41c97cfacfb8..b34783784213 100644
--- a/drivers/hwmon/nct6775-platform.c
+++ b/drivers/hwmon/nct6775-platform.c
@@ -355,7 +355,7 @@ static void nct6791_enable_io_mapping(struct nct6775_sio_data *sio_data)
 	}
 }
 
-static int __maybe_unused nct6775_suspend(struct device *dev)
+static int nct6775_suspend(struct device *dev)
 {
 	int err;
 	u16 tmp;
@@ -386,7 +386,7 @@ static int __maybe_unused nct6775_suspend(struct device *dev)
 	return err;
 }
 
-static int __maybe_unused nct6775_resume(struct device *dev)
+static int nct6775_resume(struct device *dev)
 {
 	struct nct6775_data *data = dev_get_drvdata(dev);
 	struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
@@ -467,7 +467,7 @@ static int __maybe_unused nct6775_resume(struct device *dev)
 	return err;
 }
 
-static SIMPLE_DEV_PM_OPS(nct6775_dev_pm_ops, nct6775_suspend, nct6775_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(nct6775_dev_pm_ops, nct6775_suspend, nct6775_resume);
 
 static void
 nct6775_check_fan_inputs(struct nct6775_data *data, struct nct6775_sio_data *sio_data)
@@ -934,7 +934,7 @@ static int nct6775_platform_probe(struct platform_device *pdev)
 static struct platform_driver nct6775_driver = {
 	.driver = {
 		.name	= DRVNAME,
-		.pm	= &nct6775_dev_pm_ops,
+		.pm	= pm_sleep_ptr(&nct6775_dev_pm_ops),
 	},
 	.probe		= nct6775_platform_probe,
 };
-- 
2.37.2


  parent reply	other threads:[~2022-09-25 17:30 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-25 17:27 [PATCH 00/18] hwmon: Move to new PM macros reducing driver complexity Jonathan Cameron
2022-09-25 17:27 ` [PATCH 01/18] hwmon: (abitguru) Switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() Jonathan Cameron
2022-09-25 17:27 ` [PATCH 02/18] hwmon: (abitguru3) " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 03/18] hwmon: (acpi_power_meter) " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 04/18] hwmon: (adt7x10) Switch to EXPORT_SIMPLE_DEV_PM_OPS() " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 05/18] hwmon: (gpio-fan) Switch to DEFINE_SIMPLE_DEV_PM_OPS() " Jonathan Cameron
2022-09-25 18:49   ` Guenter Roeck
2022-09-26  8:32     ` Jonathan Cameron
2022-09-25 17:27 ` [PATCH 06/18] hwmon: (it87) " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 07/18] hwmon: (lm90) " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 08/18] hwmon: (ltc2947) Switch to EXPORT_SIMPLE_DEV_PM_OPS() " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 09/18] hwmon: (max31722) Switch to DEFINE_SIMPLE_DEV_PM_OPS() " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 10/18] hwmon: (max31730) witch " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 11/18] hwmon: (max6639) Switch " Jonathan Cameron
2022-09-25 17:27 ` Jonathan Cameron [this message]
2022-09-25 17:27 ` [PATCH 13/18] hwmon: (pwm-fan) " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 14/18] hwmon: (tmp102) " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 15/18] hwmon: (tmp103) " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 16/18] hwmon: (tmp108) " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 17/18] hwmon: (w83627ehf) " Jonathan Cameron
2022-09-25 17:27 ` [PATCH 18/18] hwmon: (ina3221) Use DEFINE_RUNTIME_DEV_PM_OPS() and pm_ptr() Jonathan Cameron
2022-09-25 17:47 ` [PATCH 00/18] hwmon: Move to new PM macros reducing driver complexity Guenter Roeck

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=20220925172759.3573439-13-jic23@kernel.org \
    --to=jic23@kernel.org \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=dirty.ice.hu@gmail.com \
    --cc=hdegoede@redhat.com \
    --cc=jdelvare@suse.com \
    --cc=lars@metafoo.de \
    --cc=linus.walleij@linaro.org \
    --cc=linux-hwmon@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=nmalwade@nvidia.com \
    --cc=nuno.sa@analog.com \
    --cc=paul@crapouillou.net \
    --cc=rafael.j.wysocki@intel.com \
    --cc=stigge@antcom.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox