hwmon: (tmp513) Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20231128180654.395692-3-andriy.shevchenko@linux.intel.com [groeck: Fixed excessive line length] Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
5d9ad4e0fa
commit
df989762bc
@ -630,9 +630,9 @@ static int tmp51x_vbus_range_to_reg(struct device *dev,
|
||||
} else if (data->vbus_range_uvolt == TMP51X_VBUS_RANGE_16V) {
|
||||
data->shunt_config &= ~TMP51X_BUS_VOLTAGE_MASK;
|
||||
} else {
|
||||
dev_err(dev, "ti,bus-range-microvolt is invalid: %u\n",
|
||||
data->vbus_range_uvolt);
|
||||
return -EINVAL;
|
||||
return dev_err_probe(dev, -EINVAL,
|
||||
"ti,bus-range-microvolt is invalid: %u\n",
|
||||
data->vbus_range_uvolt);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -648,8 +648,8 @@ static int tmp51x_pga_gain_to_reg(struct device *dev, struct tmp51x_data *data)
|
||||
} else if (data->pga_gain == 1) {
|
||||
data->shunt_config |= CURRENT_SENSE_VOLTAGE_40_MASK;
|
||||
} else {
|
||||
dev_err(dev, "ti,pga-gain is invalid: %u\n", data->pga_gain);
|
||||
return -EINVAL;
|
||||
return dev_err_probe(dev, -EINVAL,
|
||||
"ti,pga-gain is invalid: %u\n", data->pga_gain);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -679,9 +679,9 @@ static int tmp51x_read_properties(struct device *dev, struct tmp51x_data *data)
|
||||
|
||||
// Check if shunt value is compatible with pga-gain
|
||||
if (data->shunt_uohms > data->pga_gain * 40 * 1000 * 1000) {
|
||||
dev_err(dev, "shunt-resistor: %u too big for pga_gain: %u\n",
|
||||
data->shunt_uohms, data->pga_gain);
|
||||
return -EINVAL;
|
||||
return dev_err_probe(dev, -EINVAL,
|
||||
"shunt-resistor: %u too big for pga_gain: %u\n",
|
||||
data->shunt_uohms, data->pga_gain);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -721,22 +721,17 @@ static int tmp51x_probe(struct i2c_client *client)
|
||||
data->max_channels = (uintptr_t)i2c_get_match_data(client);
|
||||
|
||||
ret = tmp51x_configure(dev, data);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "error configuring the device: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
if (ret < 0)
|
||||
return dev_err_probe(dev, ret, "error configuring the device\n");
|
||||
|
||||
data->regmap = devm_regmap_init_i2c(client, &tmp51x_regmap_config);
|
||||
if (IS_ERR(data->regmap)) {
|
||||
dev_err(dev, "failed to allocate register map\n");
|
||||
return PTR_ERR(data->regmap);
|
||||
}
|
||||
if (IS_ERR(data->regmap))
|
||||
return dev_err_probe(dev, PTR_ERR(data->regmap),
|
||||
"failed to allocate register map\n");
|
||||
|
||||
ret = tmp51x_init(data);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "error configuring the device: %d\n", ret);
|
||||
return -ENODEV;
|
||||
}
|
||||
if (ret < 0)
|
||||
return dev_err_probe(dev, ret, "error configuring the device\n");
|
||||
|
||||
hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,
|
||||
data,
|
||||
|
Loading…
x
Reference in New Issue
Block a user