iio: adc: meson_saradc: Use temporary variable for struct device
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 3 Jun 2022 10:00:03 +0000 (13:00 +0300)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 15 Jun 2022 21:07:10 +0000 (22:07 +0100)
Use temporary variable for struct device to make code neater.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/20220603100004.70336-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/meson_saradc.c

index 337517a8e1aceaa0ef7638567cc425767f7fa2b2..c100f933c12ea6ccf9de0dfa839c8ecf1043e78c 100644 (file)
@@ -549,6 +549,7 @@ static int meson_sar_adc_get_sample(struct iio_dev *indio_dev,
                                    int *val)
 {
        struct meson_sar_adc_priv *priv = iio_priv(indio_dev);
+       struct device *dev = indio_dev->dev.parent;
        int ret;
 
        if (chan->type == IIO_TEMP && !priv->temperature_sensor_calibrated)
@@ -572,8 +573,7 @@ static int meson_sar_adc_get_sample(struct iio_dev *indio_dev,
        meson_sar_adc_unlock(indio_dev);
 
        if (ret) {
-               dev_warn(indio_dev->dev.parent,
-                        "failed to read sample for channel %lu: %d\n",
+               dev_warn(dev, "failed to read sample for channel %lu: %d\n",
                         chan->address, ret);
                return ret;
        }
@@ -586,6 +586,7 @@ static int meson_sar_adc_iio_info_read_raw(struct iio_dev *indio_dev,
                                           int *val, int *val2, long mask)
 {
        struct meson_sar_adc_priv *priv = iio_priv(indio_dev);
+       struct device *dev = indio_dev->dev.parent;
        int ret;
 
        switch (mask) {
@@ -602,9 +603,7 @@ static int meson_sar_adc_iio_info_read_raw(struct iio_dev *indio_dev,
                if (chan->type == IIO_VOLTAGE) {
                        ret = regulator_get_voltage(priv->vref);
                        if (ret < 0) {
-                               dev_err(indio_dev->dev.parent,
-                                       "failed to get vref voltage: %d\n",
-                                       ret);
+                               dev_err(dev, "failed to get vref voltage: %d\n", ret);
                                return ret;
                        }
 
@@ -703,8 +702,7 @@ static int meson_sar_adc_temp_sensor_init(struct iio_dev *indio_dev)
        size_t read_len;
        int ret;
 
-       temperature_calib = devm_nvmem_cell_get(indio_dev->dev.parent,
-                                               "temperature_calib");
+       temperature_calib = devm_nvmem_cell_get(dev, "temperature_calib");
        if (IS_ERR(temperature_calib)) {
                ret = PTR_ERR(temperature_calib);
 
@@ -718,9 +716,7 @@ static int meson_sar_adc_temp_sensor_init(struct iio_dev *indio_dev)
                return dev_err_probe(dev, ret, "failed to get temperature_calib cell\n");
        }
 
-       priv->tsc_regmap =
-               syscon_regmap_lookup_by_phandle(indio_dev->dev.parent->of_node,
-                                               "amlogic,hhi-sysctrl");
+       priv->tsc_regmap = syscon_regmap_lookup_by_phandle(dev->of_node, "amlogic,hhi-sysctrl");
        if (IS_ERR(priv->tsc_regmap))
                return dev_err_probe(dev, PTR_ERR(priv->tsc_regmap),
                                     "failed to get amlogic,hhi-sysctrl regmap\n");
@@ -908,6 +904,7 @@ static void meson_sar_adc_set_bandgap(struct iio_dev *indio_dev, bool on_off)
 static int meson_sar_adc_hw_enable(struct iio_dev *indio_dev)
 {
        struct meson_sar_adc_priv *priv = iio_priv(indio_dev);
+       struct device *dev = indio_dev->dev.parent;
        int ret;
        u32 regval;
 
@@ -917,14 +914,13 @@ static int meson_sar_adc_hw_enable(struct iio_dev *indio_dev)
 
        ret = regulator_enable(priv->vref);
        if (ret < 0) {
-               dev_err(indio_dev->dev.parent,
-                       "failed to enable vref regulator\n");
+               dev_err(dev, "failed to enable vref regulator\n");
                goto err_vref;
        }
 
        ret = clk_prepare_enable(priv->core_clk);
        if (ret) {
-               dev_err(indio_dev->dev.parent, "failed to enable core clk\n");
+               dev_err(dev, "failed to enable core clk\n");
                goto err_core_clk;
        }
 
@@ -942,7 +938,7 @@ static int meson_sar_adc_hw_enable(struct iio_dev *indio_dev)
 
        ret = clk_prepare_enable(priv->adc_clk);
        if (ret) {
-               dev_err(indio_dev->dev.parent, "failed to enable adc clk\n");
+               dev_err(dev, "failed to enable adc clk\n");
                goto err_adc_clk;
        }
 
@@ -1177,14 +1173,14 @@ static int meson_sar_adc_probe(struct platform_device *pdev)
        void __iomem *base;
        int irq, ret;
 
-       indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv));
+       indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
        if (!indio_dev)
                return dev_err_probe(dev, -ENOMEM, "failed allocating iio device\n");
 
        priv = iio_priv(indio_dev);
        init_completion(&priv->done);
 
-       match_data = of_device_get_match_data(&pdev->dev);
+       match_data = of_device_get_match_data(dev);
        if (!match_data)
                return dev_err_probe(dev, -ENODEV, "failed to get match data\n");
 
@@ -1198,29 +1194,25 @@ static int meson_sar_adc_probe(struct platform_device *pdev)
        if (IS_ERR(base))
                return PTR_ERR(base);
 
-       priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,
-                                            priv->param->regmap_config);
+       priv->regmap = devm_regmap_init_mmio(dev, base, priv->param->regmap_config);
        if (IS_ERR(priv->regmap))
                return PTR_ERR(priv->regmap);
 
-       irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
+       irq = irq_of_parse_and_map(dev->of_node, 0);
        if (!irq)
                return -EINVAL;
 
-       ret = devm_request_irq(&pdev->dev, irq, meson_sar_adc_irq, IRQF_SHARED,
-                              dev_name(&pdev->dev), indio_dev);
+       ret = devm_request_irq(dev, irq, meson_sar_adc_irq, IRQF_SHARED, dev_name(dev), indio_dev);
        if (ret)
                return ret;
 
-       priv->clkin = devm_clk_get(&pdev->dev, "clkin");
+       priv->clkin = devm_clk_get(dev, "clkin");
        if (IS_ERR(priv->clkin))
-               return dev_err_probe(&pdev->dev, PTR_ERR(priv->clkin),
-                                    "failed to get clkin\n");
+               return dev_err_probe(dev, PTR_ERR(priv->clkin), "failed to get clkin\n");
 
-       priv->core_clk = devm_clk_get(&pdev->dev, "core");
+       priv->core_clk = devm_clk_get(dev, "core");
        if (IS_ERR(priv->core_clk))
-               return dev_err_probe(&pdev->dev, PTR_ERR(priv->core_clk),
-                                    "failed to get core clk\n");
+               return dev_err_probe(dev, PTR_ERR(priv->core_clk), "failed to get core clk\n");
 
        priv->adc_clk = devm_clk_get_optional(dev, "adc_clk");
        if (IS_ERR(priv->adc_clk))
@@ -1237,10 +1229,9 @@ static int meson_sar_adc_probe(struct platform_device *pdev)
                        return ret;
        }
 
-       priv->vref = devm_regulator_get(&pdev->dev, "vref");
+       priv->vref = devm_regulator_get(dev, "vref");
        if (IS_ERR(priv->vref))
-               return dev_err_probe(&pdev->dev, PTR_ERR(priv->vref),
-                                    "failed to get vref regulator\n");
+               return dev_err_probe(dev, PTR_ERR(priv->vref), "failed to get vref regulator\n");
 
        priv->calibscale = MILLION;
 
@@ -1270,7 +1261,7 @@ static int meson_sar_adc_probe(struct platform_device *pdev)
 
        ret = meson_sar_adc_calib(indio_dev);
        if (ret)
-               dev_warn(&pdev->dev, "calibration failed\n");
+               dev_warn(dev, "calibration failed\n");
 
        platform_set_drvdata(pdev, indio_dev);