OSDN Git Service

regulator: max8997: clean up a condition in max8997_list_voltage()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 6 Jul 2018 08:37:18 +0000 (11:37 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 9 Jul 2018 11:16:18 +0000 (12:16 +0100)
The current code generates a static cehcker warnings because "rid < 0"
is always false:

    drivers/regulator/max8997-regulator.c:169 max8997_list_voltage()
    warn: condition is always false

The problem is that because of type promotion, if "rid" is negative the
comparison against ARRAY_SIZE() is type promoted to size_t and it's
treated as a very high positive value.  I've changed the order of the
checks so now everyone is happy.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/max8997-regulator.c

index a8ea30e..029a6ee 100644 (file)
@@ -165,8 +165,7 @@ static int max8997_list_voltage(struct regulator_dev *rdev,
        int rid = rdev_get_id(rdev);
        int val;
 
-       if (rid >= ARRAY_SIZE(reg_voltage_map) ||
-                       rid < 0)
+       if (rid < 0 || rid >= ARRAY_SIZE(reg_voltage_map))
                return -EINVAL;
 
        desc = reg_voltage_map[rid];