lkml.org 
[lkml]   [2015]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 2/5] thermal: rockchip: fix a impossible condition caused by the warning
    Date
    As the Dan report the smatch check the thermal driver warning:
    drivers/thermal/rockchip_thermal.c:551 rockchip_configure_from_dt()
    warn: impossible condition '(thermal->tshut_temp > ((~0 >> 1))) =>
    (s32min-s32max > s32max)'

    Although The shut_temp read from DT is u32,the temperature is currently
    represented as int not long in the thermal driver.
    Let's change to make shut_temp instead of the thermal->tshut_temp for
    the condition.

    Fixes: commit 437df2172e8d
    ("thermal: rockchip: consistently use int for temperatures")

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Caesar Wang <wxt@rock-chips.com>

    ---

    Changes in v4:
    - As the Dmitry and Brain comments, let's change to make.sh
    tshut_temp instead of thermal->tshut_temp.

    Changes in v3:
    - As Brian comments on https://patchwork.kernel.org/patch/7580661/,
    let's remove the impossible condition.

    Changes in v2:
    - None

    Changes in v1:
    - None

    drivers/thermal/rockchip_thermal.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
    index e845841..7106288 100644
    --- a/drivers/thermal/rockchip_thermal.c
    +++ b/drivers/thermal/rockchip_thermal.c
    @@ -545,15 +545,14 @@ static int rockchip_configure_from_dt(struct device *dev,
    thermal->chip->tshut_temp);
    thermal->tshut_temp = thermal->chip->tshut_temp;
    } else {
    + if (shut_temp > INT_MAX) {
    + dev_err(dev, "Invalid tshut temperature specified: %d\n",
    + shut_temp);
    + return -ERANGE;
    + }
    thermal->tshut_temp = shut_temp;
    }

    - if (thermal->tshut_temp > INT_MAX) {
    - dev_err(dev, "Invalid tshut temperature specified: %d\n",
    - thermal->tshut_temp);
    - return -ERANGE;
    - }
    -
    if (of_property_read_u32(np, "rockchip,hw-tshut-mode", &tshut_mode)) {
    dev_warn(dev,
    "Missing tshut mode property, using default (%s)\n",
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-12-20 10:21    [W:4.325 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site