iio: adc: rockchip: Simplify probe() with local 'dev'

Simplify the probe function by using a local 'dev' variable instead of
full pointer dereference.  This makes several lines shorter, which
allows to avoid wrapping making code more readable.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c
index 263d80c5fc505bd4505af68226c7652500c833d6..0f0bf2906af038a64cc88b65aaa2e6386b905422 100644 (file)
--- a/drivers/iio/adc/rockchip_saradc.c
+++ b/drivers/iio/adc/rockchip_saradc.c
@@ -456,6 +456,7 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
 {
        const struct rockchip_saradc_data *match_data;
        struct rockchip_saradc *info = NULL;
+       struct device *dev = &pdev->dev;
        struct device_node *np = pdev->dev.of_node;
        struct iio_dev *indio_dev = NULL;
        int ret;
@@ -464,23 +465,21 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
        if (!np)
                return -ENODEV;
 
-       indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*info));
+       indio_dev = devm_iio_device_alloc(dev, sizeof(*info));
        if (!indio_dev)
                return -ENOMEM;
 
        info = iio_priv(indio_dev);
 
-       match_data = of_device_get_match_data(&pdev->dev);
+       match_data = of_device_get_match_data(dev);
        if (!match_data)
-               return dev_err_probe(&pdev->dev, -ENODEV,
-                                    "failed to match device\n");
+               return dev_err_probe(dev, -ENODEV, "failed to match device\n");
 
        info->data = match_data;
 
        /* Sanity check for possible later IP variants with more channels */
        if (info->data->num_channels > SARADC_MAX_CHANNELS)
-               return dev_err_probe(&pdev->dev, -EINVAL,
-                                    "max channels exceeded");
+               return dev_err_probe(dev, -EINVAL, "max channels exceeded");
 
        info->regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(info->regs))
@@ -490,10 +489,9 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
         * The reset should be an optional property, as it should work
         * with old devicetrees as well
         */
-       info->reset = devm_reset_control_get_optional_exclusive(&pdev->dev,
-                                                               "saradc-apb");
+       info->reset = devm_reset_control_get_optional_exclusive(dev, "saradc-apb");
        if (IS_ERR(info->reset))
-               return dev_err_probe(&pdev->dev, PTR_ERR(info->reset),
+               return dev_err_probe(dev, PTR_ERR(info->reset),
                                     "failed to get saradc-apb\n");
 
        init_completion(&info->completion);
@@ -502,14 +500,14 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
        if (irq < 0)
                return irq;
 
-       ret = devm_request_irq(&pdev->dev, irq, rockchip_saradc_isr,
+       ret = devm_request_irq(dev, irq, rockchip_saradc_isr,
                               0, dev_name(&pdev->dev), info);
        if (ret < 0)
-               return dev_err_probe(&pdev->dev, ret, "failed requesting irq %d\n", irq);
+               return dev_err_probe(dev, ret, "failed requesting irq %d\n", irq);
 
-       info->vref = devm_regulator_get(&pdev->dev, "vref");
+       info->vref = devm_regulator_get(dev, "vref");
        if (IS_ERR(info->vref))
-               return dev_err_probe(&pdev->dev, PTR_ERR(info->vref),
+               return dev_err_probe(dev, PTR_ERR(info->vref),
                                     "failed to get regulator\n");
 
        if (info->reset)
@@ -517,11 +515,9 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
 
        ret = regulator_enable(info->vref);
        if (ret < 0)
-               return dev_err_probe(&pdev->dev, ret,
-                                    "failed to enable vref regulator\n");
+               return dev_err_probe(dev, ret, "failed to enable vref regulator\n");
 
-       ret = devm_add_action_or_reset(&pdev->dev,
-                                      rockchip_saradc_regulator_disable, info);
+       ret = devm_add_action_or_reset(dev, rockchip_saradc_regulator_disable, info);
        if (ret)
                return ret;
 
@@ -531,14 +527,13 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
 
        info->uv_vref = ret;
 
-       info->pclk = devm_clk_get_enabled(&pdev->dev, "apb_pclk");
+       info->pclk = devm_clk_get_enabled(dev, "apb_pclk");
        if (IS_ERR(info->pclk))
-               return dev_err_probe(&pdev->dev, PTR_ERR(info->pclk),
-                                    "failed to get pclk\n");
+               return dev_err_probe(dev, PTR_ERR(info->pclk), "failed to get pclk\n");
 
-       info->clk = devm_clk_get_enabled(&pdev->dev, "saradc");
+       info->clk = devm_clk_get_enabled(dev, "saradc");
        if (IS_ERR(info->clk))
-               return dev_err_probe(&pdev->dev, PTR_ERR(info->clk),
+               return dev_err_probe(dev, PTR_ERR(info->clk),
                                     "failed to get adc clock\n");
        /*
         * Use a default value for the converter clock.
@@ -546,18 +541,17 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
         */
        ret = clk_set_rate(info->clk, info->data->clk_rate);
        if (ret < 0)
-               return dev_err_probe(&pdev->dev, ret,
-                                    "failed to set adc clk rate\n");
+               return dev_err_probe(dev, ret, "failed to set adc clk rate\n");
 
        platform_set_drvdata(pdev, indio_dev);
 
-       indio_dev->name = dev_name(&pdev->dev);
+       indio_dev->name = dev_name(dev);
        indio_dev->info = &rockchip_saradc_iio_info;
        indio_dev->modes = INDIO_DIRECT_MODE;
 
        indio_dev->channels = info->data->channels;
        indio_dev->num_channels = info->data->num_channels;
-       ret = devm_iio_triggered_buffer_setup(&indio_dev->dev, indio_dev, NULL,
+       ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
                                              rockchip_saradc_trigger_handler,
                                              NULL);
        if (ret)
@@ -568,7 +562,7 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = devm_add_action_or_reset(&pdev->dev,
+       ret = devm_add_action_or_reset(dev,
                                       rockchip_saradc_regulator_unreg_notifier,
                                       info);
        if (ret)
@@ -576,7 +570,7 @@ static int rockchip_saradc_probe(struct platform_device *pdev)
 
        mutex_init(&info->lock);
 
-       return devm_iio_device_register(&pdev->dev, indio_dev);
+       return devm_iio_device_register(dev, indio_dev);
 }
 
 static int rockchip_saradc_suspend(struct device *dev)