iio: magnetometer: mag3110: Simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzk@kernel.org>
Sat, 29 Aug 2020 06:47:25 +0000 (08:47 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Thu, 3 Sep 2020 18:40:51 +0000 (19:40 +0100)
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@kernel.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20200829064726.26268-17-krzk@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/magnetometer/mag3110.c

index 4d305a21c379a5260a390c2d96638aa623b201bc..838b13c8bb3dbd5157048cfb75c5e6ad900b8605 100644 (file)
@@ -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) {