From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-pm@vger.kernel.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Lucas Stach <l.stach@pengutronix.de>,
Chris Healy <cphealy@gmail.com>,
Eduardo Valentin <edubezval@gmail.com>,
Angus Ainslie <angus@akkea.ca>,
linux-imx@nxp.com, linux-kernel@vger.kernel.org
Subject: [PATCH v5 11/12] thermal_hwmon: Add devres wrapper for thermal_add_hwmon_sysfs()
Date: Tue, 23 Apr 2019 23:48:29 -0700 [thread overview]
Message-ID: <20190424064830.18179-12-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190424064830.18179-1-andrew.smirnov@gmail.com>
Add devres wrapper for thermal_add_hwmon_sysfs() to simplify driver
code.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: Lucas Stach <l.stach@pengutronix.de>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Angus Ainslie (Purism) <angus@akkea.ca>
Cc: linux-imx@nxp.com
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
drivers/thermal/thermal_hwmon.c | 28 ++++++++++++++++++++++++++++
drivers/thermal/thermal_hwmon.h | 7 +++++++
2 files changed, 35 insertions(+)
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index 40c69a533b24..4e79524182e1 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -244,3 +244,31 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
kfree(hwmon);
}
EXPORT_SYMBOL_GPL(thermal_remove_hwmon_sysfs);
+
+static void devm_thermal_hwmon_release(struct device *dev, void *res)
+{
+ thermal_remove_hwmon_sysfs(*(struct thermal_zone_device **)res);
+}
+
+int devm_thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+ struct thermal_zone_device **ptr;
+ int ret;
+
+ ptr = devres_alloc(devm_thermal_hwmon_release, sizeof(*ptr),
+ GFP_KERNEL);
+ if (!ptr)
+ return -ENOMEM;
+
+ ret = thermal_add_hwmon_sysfs(tz);
+ if (ret) {
+ devres_free(ptr);
+ return ret;
+ }
+
+ *ptr = tz;
+ devres_add(&tz->device, ptr);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(devm_thermal_add_hwmon_sysfs);
diff --git a/drivers/thermal/thermal_hwmon.h b/drivers/thermal/thermal_hwmon.h
index a160b9d62dd0..1a9d65f6a6a8 100644
--- a/drivers/thermal/thermal_hwmon.h
+++ b/drivers/thermal/thermal_hwmon.h
@@ -17,6 +17,7 @@
#ifdef CONFIG_THERMAL_HWMON
int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
+int devm_thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
#else
static inline int
@@ -25,6 +26,12 @@ thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
return 0;
}
+static inline int
+devm_thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+ return 0;
+}
+
static inline void
thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
{
--
2.20.1
next prev parent reply other threads:[~2019-04-24 6:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-24 6:48 [PATCH v5 00/12] QorIQ TMU multi-sensor and HWMON support Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 01/12] thermal: qoriq: Remove unnecessary DT node is NULL check Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 02/12] thermal: qoriq: Add local struct device pointer Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 03/12] thermal: qoriq: Don't store struct thermal_zone_device reference Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 04/12] thermal: qoriq: Drop per-sensor data Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 05/12] thermal: qoriq: Pass data to qoriq_tmu_register_tmu_zone() directly Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 06/12] thermal: qoriq: Pass data to qoriq_tmu_calibration() directly Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 07/12] thermal: qoriq: Convert driver to use devm_ioremap() Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 08/12] thermal: qoriq: Convert driver to use regmap API Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 09/12] thermal: qoriq: Enable all sensors before registering them Andrey Smirnov
2019-04-24 6:48 ` [PATCH v5 10/12] thermal: qoriq: Do not report invalid temperature reading Andrey Smirnov
2019-04-24 6:48 ` Andrey Smirnov [this message]
2019-04-24 6:48 ` [PATCH v5 12/12] thermal: qoriq: Add hwmon support Andrey Smirnov
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=20190424064830.18179-12-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=angus@akkea.ca \
--cc=cphealy@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=l.stach@pengutronix.de \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).