iio: adc: adi-axi-adc: Make use of dev_err_probe()

Be consistent and use dev_err_probe() as in all other places in the
.probe() path.

While at it, remove the line break in the version condition. Yes, it
goes over the 80 column limit but I do think the line break hurts
readability in this case. And use a struct device *dev helper for
neater code.

Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/adi-axi-adc.c b/drivers/iio/adc/adi-axi-adc.c
index 14fa4238c2b96b1ac722d537bc49ed4ca8e36925..fef4fdedb9763e247daaa43f39021b89c5a0cf48 100644 (file)
--- a/drivers/iio/adc/adi-axi-adc.c
+++ b/drivers/iio/adc/adi-axi-adc.c
@@ -674,13 +674,14 @@ static const struct iio_backend_info axi_ad408x = {
 
 static int adi_axi_adc_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        struct adi_axi_adc_state *st;
        void __iomem *base;
        unsigned int ver;
        struct clk *clk;
        int ret;
 
-       st = devm_kzalloc(&pdev->dev, sizeof(*st), GFP_KERNEL);
+       st = devm_kzalloc(dev, sizeof(*st), GFP_KERNEL);
        if (!st)
                return -ENOMEM;
 
@@ -688,20 +689,19 @@ static int adi_axi_adc_probe(struct platform_device *pdev)
        if (IS_ERR(base))
                return PTR_ERR(base);
 
-       st->dev = &pdev->dev;
-       st->regmap = devm_regmap_init_mmio(&pdev->dev, base,
-                                          &axi_adc_regmap_config);
+       st->dev = dev;
+       st->regmap = devm_regmap_init_mmio(dev, base, &axi_adc_regmap_config);
        if (IS_ERR(st->regmap))
-               return dev_err_probe(&pdev->dev, PTR_ERR(st->regmap),
+               return dev_err_probe(dev, PTR_ERR(st->regmap),
                                     "failed to init register map\n");
 
-       st->info = device_get_match_data(&pdev->dev);
+       st->info = device_get_match_data(dev);
        if (!st->info)
                return -ENODEV;
 
-       clk = devm_clk_get_enabled(&pdev->dev, NULL);
+       clk = devm_clk_get_enabled(dev, NULL);
        if (IS_ERR(clk))
-               return dev_err_probe(&pdev->dev, PTR_ERR(clk),
+               return dev_err_probe(dev, PTR_ERR(clk),
                                     "failed to get clock\n");
 
        /*
@@ -716,47 +716,42 @@ static int adi_axi_adc_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       if (ADI_AXI_PCORE_VER_MAJOR(ver) !=
-           ADI_AXI_PCORE_VER_MAJOR(st->info->version)) {
-               dev_err(&pdev->dev,
-                       "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n",
-                       ADI_AXI_PCORE_VER_MAJOR(st->info->version),
-                       ADI_AXI_PCORE_VER_MINOR(st->info->version),
-                       ADI_AXI_PCORE_VER_PATCH(st->info->version),
-                       ADI_AXI_PCORE_VER_MAJOR(ver),
-                       ADI_AXI_PCORE_VER_MINOR(ver),
-                       ADI_AXI_PCORE_VER_PATCH(ver));
-               return -ENODEV;
-       }
-
-       ret = devm_iio_backend_register(&pdev->dev, st->info->backend_info, st);
+       if (ADI_AXI_PCORE_VER_MAJOR(ver) != ADI_AXI_PCORE_VER_MAJOR(st->info->version))
+               return dev_err_probe(dev, -ENODEV,
+                                    "Major version mismatch. Expected %d.%.2d.%c, Reported %d.%.2d.%c\n",
+                                    ADI_AXI_PCORE_VER_MAJOR(st->info->version),
+                                    ADI_AXI_PCORE_VER_MINOR(st->info->version),
+                                    ADI_AXI_PCORE_VER_PATCH(st->info->version),
+                                    ADI_AXI_PCORE_VER_MAJOR(ver),
+                                    ADI_AXI_PCORE_VER_MINOR(ver),
+                                    ADI_AXI_PCORE_VER_PATCH(ver));
+
+       ret = devm_iio_backend_register(dev, st->info->backend_info, st);
        if (ret)
-               return dev_err_probe(&pdev->dev, ret,
-                                    "failed to register iio backend\n");
+               return dev_err_probe(dev, ret, "failed to register iio backend\n");
 
-       device_for_each_child_node_scoped(&pdev->dev, child) {
+       device_for_each_child_node_scoped(dev, child) {
                int val;
 
                if (!st->info->has_child_nodes)
-                       return dev_err_probe(&pdev->dev, -EINVAL,
+                       return dev_err_probe(dev, -EINVAL,
                                             "invalid fdt axi-dac compatible.");
 
                /* Processing only reg 0 node */
                ret = fwnode_property_read_u32(child, "reg", &val);
                if (ret)
-                       return dev_err_probe(&pdev->dev, ret,
-                                            "invalid reg property.");
+                       return dev_err_probe(dev, ret, "invalid reg property.");
                if (val != 0)
-                       return dev_err_probe(&pdev->dev, -EINVAL,
+                       return dev_err_probe(dev, -EINVAL,
                                             "invalid node address.");
 
                ret = axi_adc_create_platform_device(st, child);
                if (ret)
-                       return dev_err_probe(&pdev->dev, -EINVAL,
+                       return dev_err_probe(dev, -EINVAL,
                                             "cannot create device.");
        }
 
-       dev_info(&pdev->dev, "AXI ADC IP core (%d.%.2d.%c) probed\n",
+       dev_info(dev, "AXI ADC IP core (%d.%.2d.%c) probed\n",
                 ADI_AXI_PCORE_VER_MAJOR(ver),
                 ADI_AXI_PCORE_VER_MINOR(ver),
                 ADI_AXI_PCORE_VER_PATCH(ver));