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 v3 2/3] thermal: improve error message in thermal zone registration
Date: Wed, 4 Dec 2019 23:19:52 -0800 [thread overview]
Message-ID: <20191205071953.121511-3-wvw@google.com> (raw)
In-Reply-To: <20191205071953.121511-1-wvw@google.com>
Follow up with commit 67eed44b8a8a ("thermal: Add some error messages")
to clean up checkpatch warning on line length and also add more message
for developers.
Signed-off-by: Wei Wang <wvw@google.com>
---
drivers/thermal/thermal_core.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 974e2d91c30b..9db7f72e70f8 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1255,29 +1255,33 @@ thermal_zone_device_register(const char *type, int trips, int mask,
int count;
struct thermal_governor *governor;
- if (!type || strlen(type) == 0) {
+ if (!type || !type[0]) {
pr_err("Error: No thermal zone type defined\n");
return ERR_PTR(-EINVAL);
}
- if (type && strlen(type) >= THERMAL_NAME_LENGTH) {
- pr_err("Error: Thermal zone name (%s) too long, should be under %d chars\n",
- type, THERMAL_NAME_LENGTH);
+ if (strlen(type) >= THERMAL_NAME_LENGTH) {
+ pr_err("Error: Thermal zone name over %d chars: %s\n",
+ THERMAL_NAME_LENGTH, type);
return ERR_PTR(-EINVAL);
}
if (trips > THERMAL_MAX_TRIPS || trips < 0 || mask >> trips) {
- pr_err("Error: Incorrect number of thermal trips\n");
+ pr_err("Error: Incorrect number of thermal trips: %s\n", type);
return ERR_PTR(-EINVAL);
}
if (!ops) {
- pr_err("Error: Thermal zone device ops not defined\n");
+ pr_err("Error: Thermal zone device ops not defined: %s\n",
+ type);
return ERR_PTR(-EINVAL);
}
- if (trips > 0 && (!ops->get_trip_type || !ops->get_trip_temp))
+ if (trips > 0 && (!ops->get_trip_type || !ops->get_trip_temp)) {
+ pr_err("Error: Thermal zone device missing callback: %s\n",
+ type);
return ERR_PTR(-EINVAL);
+ }
tz = kzalloc(sizeof(*tz), GFP_KERNEL);
if (!tz)
--
2.24.0.393.g34dc348eaf-goog
next prev parent reply other threads:[~2019-12-05 7:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 7:19 [PATCH v3 0/3] thermal: introduce by-name softlink Wei Wang
2019-12-05 7:19 ` [PATCH v3 1/3] thermal: prevent cooling device with no type to be registered Wei Wang
2019-12-09 7:41 ` Amit Kucheria
2019-12-09 17:34 ` Wei Wang
2019-12-09 19:36 ` Daniel Lezcano
2019-12-09 21:13 ` Wei Wang
2019-12-05 7:19 ` Wei Wang [this message]
2019-12-09 7:41 ` [PATCH v3 2/3] thermal: improve error message in thermal zone registration Amit Kucheria
2019-12-05 7:19 ` [PATCH v3 3/3] thermal: create softlink by name for thermal_zone and cooling_device Wei Wang
2019-12-06 19:15 ` Matthias Kaehlcke
2019-12-09 7:42 ` Amit Kucheria
2019-12-10 14:36 ` [PATCH v3 0/3] thermal: introduce by-name softlink Daniel Lezcano
2019-12-10 20:01 ` Wei Wang
2019-12-10 20:54 ` Daniel Lezcano
2019-12-11 8:53 ` Greg Kroah-Hartman
2019-12-11 8:54 ` Greg Kroah-Hartman
2019-12-11 20:11 ` Wei Wang
2019-12-11 21:11 ` Daniel Lezcano
2019-12-11 22:19 ` Wei Wang
2019-12-15 16:34 ` Sandeep Patil
2019-12-16 17:37 ` Wei Wang
2019-12-12 7:34 ` Greg Kroah-Hartman
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=20191205071953.121511-3-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).