On Wed, 26 Aug 2020 18:15:38 +0200
Krzysztof Kozlowski <krzk@xxxxxxxxxx> wrote:
> 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: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
I'm a lazy person, so if you have a series like this where you decide
to post a new version without anyone having commented on it, please
send a quick reply to say you have done that. Avoids me
applying wrong versions of things!
Thanks,
Jonathan
> ---
> drivers/iio/magnetometer/mag3110.c | 20 ++++++--------------
> 1 file changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c
> index 4d305a21c379..838b13c8bb3d 100644
> --- a/drivers/iio/magnetometer/mag3110.c
> +++ b/drivers/iio/magnetometer/mag3110.c
> @@ -476,22 +476,14 @@ static int mag3110_probe(struct i2c_client *client,
> data = iio_priv(indio_dev);
>
> data->vdd_reg = devm_regulator_get(&client->dev, "vdd");
> - if (IS_ERR(data->vdd_reg)) {
> - if (PTR_ERR(data->vdd_reg) == -EPROBE_DEFER)
> - return -EPROBE_DEFER;
> -
> - dev_err(&client->dev, "failed to get VDD regulator!\n");
> - return PTR_ERR(data->vdd_reg);
> - }
> + if (IS_ERR(data->vdd_reg))
> + return dev_err_probe(&client->dev, PTR_ERR(data->vdd_reg),
> + "failed to get VDD regulator!\n");
>
> data->vddio_reg = devm_regulator_get(&client->dev, "vddio");
> - if (IS_ERR(data->vddio_reg)) {
> - if (PTR_ERR(data->vddio_reg) == -EPROBE_DEFER)
> - return -EPROBE_DEFER;
> -
> - dev_err(&client->dev, "failed to get VDDIO regulator!\n");
> - return PTR_ERR(data->vddio_reg);
> - }
> + if (IS_ERR(data->vddio_reg))
> + return dev_err_probe(&client->dev, PTR_ERR(data->vddio_reg),
> + "failed to get VDDIO regulator!\n");
>
> ret = regulator_enable(data->vdd_reg);
> if (ret) {
