Commit b564b99d authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Jonathan Cameron

iio: adc: spear_adc: Use dev_err_probe()

Use the dev_err_probe() helper to simplify error handling during probe.
This also handle scenario, when EDEFER is returned and useless error
is printed.
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230826062733.3714169-3-ruanjinjie@huawei.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 3878ae2a
...@@ -274,10 +274,9 @@ static int spear_adc_probe(struct platform_device *pdev) ...@@ -274,10 +274,9 @@ static int spear_adc_probe(struct platform_device *pdev)
int irq; int irq;
indio_dev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_state)); indio_dev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_state));
if (!indio_dev) { if (!indio_dev)
dev_err(dev, "failed allocating iio device\n"); return dev_err_probe(dev, -ENOMEM,
return -ENOMEM; "failed allocating iio device\n");
}
st = iio_priv(indio_dev); st = iio_priv(indio_dev);
...@@ -298,10 +297,9 @@ static int spear_adc_probe(struct platform_device *pdev) ...@@ -298,10 +297,9 @@ static int spear_adc_probe(struct platform_device *pdev)
(struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx; (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;
st->clk = devm_clk_get_enabled(dev, NULL); st->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(st->clk)) { if (IS_ERR(st->clk))
dev_err(dev, "failed enabling clock\n"); return dev_err_probe(dev, PTR_ERR(st->clk),
return PTR_ERR(st->clk); "failed enabling clock\n");
}
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) if (irq < 0)
...@@ -309,16 +307,13 @@ static int spear_adc_probe(struct platform_device *pdev) ...@@ -309,16 +307,13 @@ static int spear_adc_probe(struct platform_device *pdev)
ret = devm_request_irq(dev, irq, spear_adc_isr, 0, SPEAR_ADC_MOD_NAME, ret = devm_request_irq(dev, irq, spear_adc_isr, 0, SPEAR_ADC_MOD_NAME,
st); st);
if (ret < 0) { if (ret < 0)
dev_err(dev, "failed requesting interrupt\n"); return dev_err_probe(dev, ret, "failed requesting interrupt\n");
return ret;
}
if (of_property_read_u32(np, "sampling-frequency", if (of_property_read_u32(np, "sampling-frequency",
&st->sampling_freq)) { &st->sampling_freq))
dev_err(dev, "sampling-frequency missing in DT\n"); return dev_err_probe(dev, -EINVAL,
return -EINVAL; "sampling-frequency missing in DT\n");
}
/* /*
* Optional avg_samples defaults to 0, resulting in single data * Optional avg_samples defaults to 0, resulting in single data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment