Skip to content

Commit 7735390

Browse files
andy-shevgroeck
authored andcommitted
hwmon: (isl28022) Don't check for specific errors when parsing properties
Instead of checking for the specific error codes (that can be considered a layering violation to some extent) check for the property existence first and then either parse it, or apply a default value. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20260219140532.2259235-1-andriy.shevchenko@linux.intel.com Signed-off-by: Guenter Roeck <linux@roeck-us.net>
1 parent a69ae32 commit 7735390

1 file changed

Lines changed: 24 additions & 18 deletions

File tree

drivers/hwmon/isl28022.c

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -338,21 +338,28 @@ DEFINE_SHOW_ATTRIBUTE(shunt_voltage);
338338
*/
339339
static int isl28022_read_properties(struct device *dev, struct isl28022_data *data)
340340
{
341+
const char *propname;
341342
u32 val;
342343
int err;
343344

344-
err = device_property_read_u32(dev, "shunt-resistor-micro-ohms", &val);
345-
if (err == -EINVAL)
345+
propname = "shunt-resistor-micro-ohms";
346+
if (device_property_present(dev, propname)) {
347+
err = device_property_read_u32(dev, propname, &val);
348+
if (err)
349+
return err;
350+
} else {
346351
val = 10000;
347-
else if (err < 0)
348-
return err;
352+
}
349353
data->shunt = val;
350354

351-
err = device_property_read_u32(dev, "renesas,shunt-range-microvolt", &val);
352-
if (err == -EINVAL)
355+
propname = "renesas,shunt-range-microvolt";
356+
if (device_property_present(dev, propname)) {
357+
err = device_property_read_u32(dev, propname, &val);
358+
if (err)
359+
return err;
360+
} else {
353361
val = 320000;
354-
else if (err < 0)
355-
return err;
362+
}
356363

357364
switch (val) {
358365
case 40000:
@@ -376,20 +383,19 @@ static int isl28022_read_properties(struct device *dev, struct isl28022_data *da
376383
goto shunt_invalid;
377384
break;
378385
default:
379-
return dev_err_probe(dev, -EINVAL,
380-
"renesas,shunt-range-microvolt invalid value %d\n",
381-
val);
386+
return dev_err_probe(dev, -EINVAL, "%s invalid value %u\n", propname, val);
382387
}
383388

384-
err = device_property_read_u32(dev, "renesas,average-samples", &val);
385-
if (err == -EINVAL)
389+
propname = "renesas,average-samples";
390+
if (device_property_present(dev, propname)) {
391+
err = device_property_read_u32(dev, propname, &val);
392+
if (err)
393+
return err;
394+
} else {
386395
val = 1;
387-
else if (err < 0)
388-
return err;
396+
}
389397
if (val > 128 || hweight32(val) != 1)
390-
return dev_err_probe(dev, -EINVAL,
391-
"renesas,average-samples invalid value %d\n",
392-
val);
398+
return dev_err_probe(dev, -EINVAL, "%s invalid value %u\n", propname, val);
393399

394400
data->average = val;
395401

0 commit comments

Comments
 (0)