2023-01-31 10:34:09

by Alexander Stein

Subject: [PATCH 1/1] hwmon: (iio_hwmon) use dev_err_probe

Instead of just returning an error code, add an error message as well.
While at it, simplify the code and use a common return path.
Upon deferral this also nicely lists the following message in
/sys/kernel/debug/devices_deferred:
adc iio_hwmon: Failed to get channels

Signed-off-by: Alexander Stein <[email protected]>
---
drivers/hwmon/iio_hwmon.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
index 3aa40893fc09..4c8a80847891 100644
--- a/drivers/hwmon/iio_hwmon.c
+++ b/drivers/hwmon/iio_hwmon.c
@@ -77,9 +77,11 @@ static int iio_hwmon_probe(struct platform_device *pdev)

channels = devm_iio_channel_get_all(dev);
if (IS_ERR(channels)) {
- if (PTR_ERR(channels) == -ENODEV)
- return -EPROBE_DEFER;
- return PTR_ERR(channels);
+ ret = PTR_ERR(channels);
+ if (ret == -ENODEV)
+ ret = -EPROBE_DEFER;
+ return dev_err_probe(dev, ret,
+ "Failed to get channels\n");
}

st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL);
--
2.34.1

2023-01-31 15:08:54

by Guenter Roeck

Subject: Re: [PATCH 1/1] hwmon: (iio_hwmon) use dev_err_probe

On Tue, Jan 31, 2023 at 11:33:59AM +0100, Alexander Stein wrote:
> Instead of just returning an error code, add an error message as well.
> While at it, simplify the code and use a common return path.
> Upon deferral this also nicely lists the following message in
> /sys/kernel/debug/devices_deferred:
> adc iio_hwmon: Failed to get channels
>
> Signed-off-by: Alexander Stein <[email protected]>

Applied to hwmon-next.

Thanks,
Guenter

> ---
> drivers/hwmon/iio_hwmon.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
> index 3aa40893fc09..4c8a80847891 100644
> --- a/drivers/hwmon/iio_hwmon.c
> +++ b/drivers/hwmon/iio_hwmon.c
> @@ -77,9 +77,11 @@ static int iio_hwmon_probe(struct platform_device *pdev)
>
> channels = devm_iio_channel_get_all(dev);
> if (IS_ERR(channels)) {
> - if (PTR_ERR(channels) == -ENODEV)
> - return -EPROBE_DEFER;
> - return PTR_ERR(channels);
> + ret = PTR_ERR(channels);
> + if (ret == -ENODEV)
> + ret = -EPROBE_DEFER;
> + return dev_err_probe(dev, ret,
> + "Failed to get channels\n");
> }
>
> st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL);