iio: adc: aspeed: Simplify probe() with local 'dev' and 'np'

Simplify the probe function by using local 'dev' and 'np' variables
instead of full pointer dereferences.  This makes several lines shorter,
which allows to avoid wrapping making code more readable.  While
touching the return line, simplify by avoiding unnecessary 'ret'
assignment.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c
index 1ae45fe90e6ca7a3289873b4e93180881fb9a6e5..4be44c524b4daa9d7842de0df57cda4f21c2861b 100644 (file)
--- a/drivers/iio/adc/aspeed_adc.c
+++ b/drivers/iio/adc/aspeed_adc.c
@@ -472,16 +472,18 @@ static int aspeed_adc_probe(struct platform_device *pdev)
        struct aspeed_adc_data *data;
        int ret;
        u32 adc_engine_control_reg_val;
+       struct device *dev = &pdev->dev;
+       struct device_node *np = dev_of_node(dev);
        unsigned long scaler_flags = 0;
        char clk_name[32], clk_parent_name[32];
 
-       indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*data));
+       indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
        if (!indio_dev)
                return -ENOMEM;
 
        data = iio_priv(indio_dev);
-       data->dev = &pdev->dev;
-       data->model_data = of_device_get_match_data(&pdev->dev);
+       data->dev = dev;
+       data->model_data = of_device_get_match_data(dev);
        platform_set_drvdata(pdev, indio_dev);
 
        data->base = devm_platform_ioremap_resource(pdev, 0);
@@ -491,16 +493,15 @@ static int aspeed_adc_probe(struct platform_device *pdev)
        /* Register ADC clock prescaler with source specified by device tree. */
        spin_lock_init(&data->clk_lock);
        snprintf(clk_parent_name, ARRAY_SIZE(clk_parent_name), "%s",
-                of_clk_get_parent_name(pdev->dev.of_node, 0));
+                of_clk_get_parent_name(np, 0));
        snprintf(clk_name, ARRAY_SIZE(clk_name), "%s-fixed-div",
                 data->model_data->model_name);
-       data->fixed_div_clk = clk_hw_register_fixed_factor(
-               &pdev->dev, clk_name, clk_parent_name, 0, 1, 2);
+       data->fixed_div_clk = clk_hw_register_fixed_factor(dev, clk_name,
+                                                          clk_parent_name, 0, 1, 2);
        if (IS_ERR(data->fixed_div_clk))
                return PTR_ERR(data->fixed_div_clk);
 
-       ret = devm_add_action_or_reset(data->dev,
-                                      aspeed_adc_unregister_fixed_divider,
+       ret = devm_add_action_or_reset(dev, aspeed_adc_unregister_fixed_divider,
                                       data->fixed_div_clk);
        if (ret)
                return ret;
@@ -510,7 +511,7 @@ static int aspeed_adc_probe(struct platform_device *pdev)
                snprintf(clk_name, ARRAY_SIZE(clk_name), "%s-prescaler",
                         data->model_data->model_name);
                data->clk_prescaler = devm_clk_hw_register_divider(
-                       &pdev->dev, clk_name, clk_parent_name, 0,
+                       dev, clk_name, clk_parent_name, 0,
                        data->base + ASPEED_REG_CLOCK_CONTROL, 17, 15, 0,
                        &data->clk_lock);
                if (IS_ERR(data->clk_prescaler))
@@ -526,7 +527,7 @@ static int aspeed_adc_probe(struct platform_device *pdev)
        snprintf(clk_name, ARRAY_SIZE(clk_name), "%s-scaler",
                 data->model_data->model_name);
        data->clk_scaler = devm_clk_hw_register_divider(
-               &pdev->dev, clk_name, clk_parent_name, scaler_flags,
+               dev, clk_name, clk_parent_name, scaler_flags,
                data->base + ASPEED_REG_CLOCK_CONTROL, 0,
                data->model_data->scaler_bit_width,
                data->model_data->need_prescaler ? CLK_DIVIDER_ONE_BASED : 0,
@@ -534,15 +535,14 @@ static int aspeed_adc_probe(struct platform_device *pdev)
        if (IS_ERR(data->clk_scaler))
                return PTR_ERR(data->clk_scaler);
 
-       data->rst = devm_reset_control_get_shared(&pdev->dev, NULL);
+       data->rst = devm_reset_control_get_shared(dev, NULL);
        if (IS_ERR(data->rst))
-               return dev_err_probe(&pdev->dev, PTR_ERR(data->rst),
+               return dev_err_probe(dev, PTR_ERR(data->rst),
                                     "invalid or missing reset controller device tree entry");
 
        reset_control_deassert(data->rst);
 
-       ret = devm_add_action_or_reset(data->dev, aspeed_adc_reset_assert,
-                                      data->rst);
+       ret = devm_add_action_or_reset(dev, aspeed_adc_reset_assert, data->rst);
        if (ret)
                return ret;
 
@@ -554,7 +554,7 @@ static int aspeed_adc_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       if (of_property_present(data->dev->of_node, "aspeed,battery-sensing")) {
+       if (of_property_present(np, "aspeed,battery-sensing")) {
                if (data->model_data->bat_sense_sup) {
                        data->battery_sensing = 1;
                        if (readl(data->base + ASPEED_REG_ENGINE_CONTROL) &
@@ -566,15 +566,13 @@ static int aspeed_adc_probe(struct platform_device *pdev)
                                data->battery_mode_gain.div = 2;
                        }
                } else
-                       dev_warn(&pdev->dev,
-                                "Failed to enable battery-sensing mode\n");
+                       dev_warn(dev, "Failed to enable battery-sensing mode\n");
        }
 
        ret = clk_prepare_enable(data->clk_scaler->clk);
        if (ret)
                return ret;
-       ret = devm_add_action_or_reset(data->dev,
-                                      aspeed_adc_clk_disable_unprepare,
+       ret = devm_add_action_or_reset(dev, aspeed_adc_clk_disable_unprepare,
                                       data->clk_scaler->clk);
        if (ret)
                return ret;
@@ -592,8 +590,7 @@ static int aspeed_adc_probe(struct platform_device *pdev)
        writel(adc_engine_control_reg_val,
               data->base + ASPEED_REG_ENGINE_CONTROL);
 
-       ret = devm_add_action_or_reset(data->dev, aspeed_adc_power_down,
-                                       data);
+       ret = devm_add_action_or_reset(dev, aspeed_adc_power_down, data);
        if (ret)
                return ret;
 
@@ -625,8 +622,7 @@ static int aspeed_adc_probe(struct platform_device *pdev)
                                            aspeed_adc_iio_channels;
        indio_dev->num_channels = data->model_data->num_channels;
 
-       ret = devm_iio_device_register(data->dev, indio_dev);
-       return ret;
+       return devm_iio_device_register(dev, indio_dev);
 }
 
 static const struct aspeed_adc_trim_locate ast2500_adc_trim = {