Skip to content

Commit

Permalink
iio: adc: meson_saradc: Use temporary variable for struct device
Browse files Browse the repository at this point in the history 
Use temporary variable for struct device to make code neater.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  • Loading branch information
@andy-shev @intel-lab-lkp
andy-shev authored and intel-lab-lkp committed May 31, 2022
1 parent c96efe0 commit d2d1283
Showing 1 changed file with 31 additions and 42 deletions.
73 changes: 31 additions & 42 deletions drivers/iio/adc/meson_saradc.c
View file
Expand Up @@ -345,6 +345,7 @@ static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev,
int *val)
{
struct meson_sar_adc_priv *priv = iio_priv(indio_dev);
struct device *idev = &indio_dev->dev;
int regval, fifo_chan, fifo_val, count;

if (!wait_for_completion_timeout(&priv->done,
Expand All @@ -353,16 +354,14 @@ static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev,

count = meson_sar_adc_get_fifo_count(indio_dev);
if (count != 1) {
dev_err(&indio_dev->dev,
"ADC FIFO has %d element(s) instead of one\n", count);
dev_err(idev, "ADC FIFO has %d element(s) instead of one\n", count);
return -EINVAL;
}

regmap_read(priv->regmap, MESON_SAR_ADC_FIFO_RD, &regval);
fifo_chan = FIELD_GET(MESON_SAR_ADC_FIFO_RD_CHAN_ID_MASK, regval);
if (fifo_chan != chan->address) {
dev_err(&indio_dev->dev,
"ADC FIFO entry belongs to channel %d instead of %lu\n",
dev_err(idev, "ADC FIFO entry belongs to channel %d instead of %lu\n",
fifo_chan, chan->address);
return -EINVAL;
}
Expand Down Expand Up @@ -550,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)
Expand All @@ -573,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;
}
Expand All @@ -587,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) {
Expand All @@ -603,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;
}

Expand Down Expand Up @@ -650,11 +648,12 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,
void __iomem *base)
{
struct meson_sar_adc_priv *priv = iio_priv(indio_dev);
struct device *idev = &indio_dev->dev;
struct device *dev = dev->parent;
struct clk_init_data init;
const char *clk_parents[1];

init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%s#adc_div",
dev_name(indio_dev->dev.parent));
init.name = devm_kasprintf(idev, GFP_KERNEL, "%s#adc_div", dev_name(dev));
if (!init.name)
return -ENOMEM;

Expand All @@ -670,13 +669,11 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,
priv->clk_div.hw.init = &init;
priv->clk_div.flags = 0;

priv->adc_div_clk = devm_clk_register(&indio_dev->dev,
&priv->clk_div.hw);
priv->adc_div_clk = devm_clk_register(idev, &priv->clk_div.hw);
if (WARN_ON(IS_ERR(priv->adc_div_clk)))
return PTR_ERR(priv->adc_div_clk);

init.name = devm_kasprintf(&indio_dev->dev, GFP_KERNEL, "%s#adc_en",
dev_name(indio_dev->dev.parent));
init.name = devm_kasprintf(idev, GFP_KERNEL, "%s#adc_en", dev_name(dev));
if (!init.name)
return -ENOMEM;

Expand All @@ -690,7 +687,7 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,
priv->clk_gate.bit_idx = __ffs(MESON_SAR_ADC_REG3_CLK_EN);
priv->clk_gate.hw.init = &init;

priv->adc_clk = devm_clk_register(&indio_dev->dev, &priv->clk_gate.hw);
priv->adc_clk = devm_clk_register(idev, &priv->clk_gate.hw);
if (WARN_ON(IS_ERR(priv->adc_clk)))
return PTR_ERR(priv->adc_clk);

Expand All @@ -706,8 +703,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);

Expand All @@ -721,9 +717,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");

Expand Down Expand Up @@ -910,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;

Expand All @@ -919,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;
}

Expand All @@ -944,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;
}

Expand Down Expand Up @@ -1179,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");

Expand All @@ -1200,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))
Expand All @@ -1239,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;

Expand Down Expand Up @@ -1272,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);

Expand Down

0 comments on commit d2d1283

Please sign in to comment.