| Message ID | 20230318144412.75046-1-frank.li@vivo.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/9] thermal/hwmon: Add error information printing for devm_thermal_add_hwmon_sysfs() | expand |
On Sat, Mar 18, 2023 at 10:44:09PM +0800, Yangtao Li wrote: > The upper-layer devm_thermal_add_hwmon_sysfs() function can directly > print error information. > > Signed-off-by: Yangtao Li <frank.li@vivo.com> > --- > drivers/thermal/tegra/tegra30-tsensor.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/thermal/tegra/tegra30-tsensor.c b/drivers/thermal/tegra/tegra30-tsensor.c > index cb584a5735ed..c243e9d76d3c 100644 > --- a/drivers/thermal/tegra/tegra30-tsensor.c > +++ b/drivers/thermal/tegra/tegra30-tsensor.c > @@ -523,8 +523,7 @@ static int tegra_tsensor_register_channel(struct tegra_tsensor *ts, > return 0; > } > > - if (devm_thermal_add_hwmon_sysfs(ts->dev, tsc->tzd)) > - dev_warn(ts->dev, "failed to add hwmon sysfs attributes\n"); > + devm_thermal_add_hwmon_sysfs(ts->dev, tsc->tzd); I don't see any error messages output by devm_thermal_add_hwmon_sysfs() nor any of the functions that it calls. Did I miss something? Thierry
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c index c59db17dddd6..ae87401b1a1d 100644 --- a/drivers/thermal/thermal_hwmon.c +++ b/drivers/thermal/thermal_hwmon.c @@ -271,11 +271,15 @@ int devm_thermal_add_hwmon_sysfs(struct device *dev, struct thermal_zone_device ptr = devres_alloc(devm_thermal_hwmon_release, sizeof(*ptr), GFP_KERNEL); - if (!ptr) + if (!ptr) { + dev_err(dev, "Failed to allocate device resource data\n"); return -ENOMEM; + } ret = thermal_add_hwmon_sysfs(tz); if (ret) { + dev_err(dev, "Failed to add hwmon sysfs attributes\n"); + devres_free(ptr); return ret; }
Ensure that all error handling branches print error information. In this way, when this function fails, the upper-layer functions can directly return an error code without missing debugging information. Otherwise, the error message will be printed redundantly or missing. Signed-off-by: Yangtao Li <frank.li@vivo.com> --- drivers/thermal/thermal_hwmon.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)