Linux Power Management development
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-pm@vger.kernel.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
	Chris Healy <cphealy@gmail.com>,
	Lucas Stach <l.stach@pengutronix.de>,
	Zhang Rui <rui.zhang@intel.com>,
	Eduardo Valentin <edubezval@gmail.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	linux-imx@nxp.com, linux-kernel@vger.kernel.org
Subject: [PATCH 11/12] thermal: qoriq: Be more strict when parsing "thermal-sensors"
Date: Mon, 18 Feb 2019 11:11:40 -0800	[thread overview]
Message-ID: <20190218191141.3729-12-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190218191141.3729-1-andrew.smirnov@gmail.com>

As per Documentation/devicetree/bindings/thermal/qoriq-thermal.txt
thermal-sensor-cells _must_ be 1, so there is no reason to be more
lenient in the code and treat the absence of argument in
thermal-sensors specifier as a valid DT code. Drop that special case
to simplify sensor ID retreival code.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-imx@nxp.com
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/thermal/qoriq_thermal.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index d4f5e180e1ee..f746c62789b0 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -82,14 +82,14 @@ static int qoriq_tmu_get_sensor_id(void)
 		goto out;
 	}
 
-	if (sensor_specs.args_count >= 1) {
-		id = sensor_specs.args[0];
-		WARN(sensor_specs.args_count > 1,
-				"%pOFn: too many cells in sensor specifier %d\n",
-				sensor_specs.np, sensor_specs.args_count);
-	} else {
-		id = 0;
+	if (sensor_specs.args_count != 1) {
+		pr_err("%pOFn: Invalid number of cells in sensor specifier %d\n",
+		       sensor_specs.np, sensor_specs.args_count);
+		id = -EINVAL;
+		goto out;
 	}
+
+	id = sensor_specs.args[0];
 out:
 	of_node_put(np);
 	of_node_put(sensor_np);
-- 
2.20.1

  parent reply	other threads:[~2019-02-18 19:11 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-18 19:11 [PATCH 00/12] QorIQ TMU multi-sensor and HWMON support Andrey Smirnov
2019-02-18 19:11 ` [PATCH 01/12] thermal_hwmon: Add devres wrapper for thermal_add_hwmon_sysfs() Andrey Smirnov
2019-02-18 19:11 ` [PATCH 02/12] thermal: qoriq: Remove unnecessary DT node is NULL check Andrey Smirnov
2019-02-18 19:11 ` [PATCH 03/12] thermal: qoriq: Add local struct device pointer in qoriq_tmu_probe() Andrey Smirnov
2019-02-18 19:11 ` [PATCH 04/12] thermal: qoriq: Don't pass platform_device to qoriq_tmu_calibration() Andrey Smirnov
2019-02-18 19:11 ` [PATCH 05/12] thermal: qoriq: Convert driver to use devm_ioremap() Andrey Smirnov
2019-02-18 19:11 ` [PATCH 06/12] thermal: qoriq: Add hwmon support Andrey Smirnov
2019-02-18 19:11 ` [PATCH 07/12] thermal: qoriq: Convert driver to use regmap API Andrey Smirnov
2019-02-18 19:11 ` [PATCH 09/12] thermal: qoriq: Do not report invalid temperature reading Andrey Smirnov
2019-02-18 19:11 ` [PATCH 10/12] thermal: qoriq: Simplify error handling in qoriq_tmu_get_sensor_id() Andrey Smirnov
2019-02-18 19:11 ` Andrey Smirnov [this message]
2019-02-18 19:11 ` [PATCH 12/12] thermal: qoriq: Add support for multiple thremal sites Andrey Smirnov
2019-02-21  0:57   ` Eduardo Valentin
2019-02-21 18:53     ` Andrey Smirnov
2019-02-21  0:52 ` [PATCH 00/12] QorIQ TMU multi-sensor and HWMON support Eduardo Valentin
2019-02-21 18:45   ` 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=20190218191141.3729-12-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --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 \
    --cc=rui.zhang@intel.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