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 <[email protected]> Cc: Chris Healy <[email protected]> Cc: Lucas Stach <[email protected]> Cc: Zhang Rui <[email protected]> Cc: Eduardo Valentin <[email protected]> Cc: Daniel Lezcano <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] --- 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
