From: Wei Wang <wvw@google.com>
To: unlisted-recipients:; (no To-header on input)
Cc: wei.vince.wang@gmail.com, Wei Wang <wvw@google.com>,
Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Amit Kucheria <amit.kucheria@verdurent.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 1/2] thermal: fix and clean up tz and cdev registration
Date: Wed, 4 Dec 2019 13:56:17 -0800 [thread overview]
Message-ID: <20191204215618.125826-2-wvw@google.com> (raw)
In-Reply-To: <20191204215618.125826-1-wvw@google.com>
Make cooling device registration behavior consistent with
thermal zone. This patch also cleans up a unnecessary
nullptr check.
Signed-off-by: Wei Wang <wvw@google.com>
---
drivers/thermal/thermal_core.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index d4481cc8958f..64fbb59c2f44 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -954,8 +954,16 @@ __thermal_cooling_device_register(struct device_node *np,
struct thermal_zone_device *pos = NULL;
int result;
- if (type && strlen(type) >= THERMAL_NAME_LENGTH)
- return ERR_PTR(-EINVAL);
+ if (!type || !type[0]) {
+ pr_err("Error: No cooling device type defined\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ if (strlen(type) >= THERMAL_NAME_LENGTH) {
+ pr_err("Error: Cooling device name (%s) too long, "
+ "should be under %d chars\n", type, THERMAL_NAME_LENGTH);
+ return ERR_PTR(-EINVAL);
+ }
if (!ops || !ops->get_max_state || !ops->get_cur_state ||
!ops->set_cur_state)
@@ -972,7 +980,7 @@ __thermal_cooling_device_register(struct device_node *np,
}
cdev->id = result;
- strlcpy(cdev->type, type ? : "", sizeof(cdev->type));
+ strlcpy(cdev->type, type, sizeof(cdev->type));
mutex_init(&cdev->lock);
INIT_LIST_HEAD(&cdev->thermal_instances);
cdev->np = np;
@@ -1250,7 +1258,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,
return ERR_PTR(-EINVAL);
}
- if (type && strlen(type) >= THERMAL_NAME_LENGTH) {
+ if (strlen(type) >= THERMAL_NAME_LENGTH) {
pr_err("Error: Thermal zone name (%s) too long, should be under %d chars\n",
type, THERMAL_NAME_LENGTH);
return ERR_PTR(-EINVAL);
--
2.24.0.393.g34dc348eaf-goog
next prev parent reply other threads:[~2019-12-04 21:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 6:13 [PATCH] thermal: create softlink by name for thermal_zone and cooling_device Wei Wang
2019-10-16 16:50 ` Amit Kucheria
2019-10-16 17:15 ` Amit Kucheria
2019-10-16 21:34 ` Wei Wang
2019-11-11 5:26 ` Amit Kucheria
2019-11-11 17:52 ` Wei Wang
2019-12-04 12:45 ` Amit Kucheria
2019-12-04 21:56 ` [PATCH v2 0/2] thermal: introduce by-name softlink Wei Wang
2019-12-04 21:56 ` Wei Wang [this message]
2019-12-05 4:13 ` [PATCH v2 1/2] thermal: fix and clean up tz and cdev registration Amit Kucheria
2019-12-05 6:14 ` Wei Wang
2019-12-05 6:26 ` Amit Kucheria
2019-12-05 7:06 ` Amit Kucheria
2019-12-05 7:56 ` Zhang Rui
2019-12-04 21:56 ` [PATCH v2 2/2] thermal: create softlink by name for thermal_zone and cooling_device Wei Wang
2019-12-05 4:14 ` Amit Kucheria
2019-12-04 21:58 ` [PATCH] " Wei Wang
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=20191204215618.125826-2-wvw@google.com \
--to=wvw@google.com \
--cc=amit.kucheria@verdurent.com \
--cc=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=wei.vince.wang@gmail.com \
/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).