diff mbox series

[-next] iio: adc: at91-sama5d2_adc: Use devm_platform_get_and_ioremap_resource()

Message ID 20200918082837.32610-1-bobo.shaobowang@huawei.com
State New
Headers show
Series [-next] iio: adc: at91-sama5d2_adc: Use devm_platform_get_and_ioremap_resource() | expand

Commit Message

Wang ShaoBo Sept. 18, 2020, 8:28 a.m. UTC
Make use of devm_platform_get_and_ioremap_resource() provided by
driver core platform instead of duplicated analogue.

Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
---
 drivers/iio/adc/at91-sama5d2_adc.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Jonathan Cameron Sept. 23, 2020, 8:52 p.m. UTC | #1
On Fri, 18 Sep 2020 16:28:37 +0800
Wang ShaoBo <bobo.shaobowang@huawei.com> wrote:

> Make use of devm_platform_get_and_ioremap_resource() provided by
> driver core platform instead of duplicated analogue.
> 
> Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>

Hi,

Thanks.  As far as I can see this boilerplate removal with no
side effects, so applied to the togreg branch of iio.git and pushed out
as testing for the autobuilders to poke at it.

Thanks,

Jonathan

> ---
>  drivers/iio/adc/at91-sama5d2_adc.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
> index de9583d6cddd..ad7d9819f83c 100644
> --- a/drivers/iio/adc/at91-sama5d2_adc.c
> +++ b/drivers/iio/adc/at91-sama5d2_adc.c
> @@ -1764,17 +1764,13 @@ static int at91_adc_probe(struct platform_device *pdev)
>  	mutex_init(&st->lock);
>  	INIT_WORK(&st->touch_st.workq, at91_adc_workq_handler);
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	if (!res)
> -		return -EINVAL;
> +	st->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> +	if (IS_ERR(st->base))
> +		return PTR_ERR(st->base);
>  
>  	/* if we plan to use DMA, we need the physical address of the regs */
>  	st->dma_st.phys_addr = res->start;
>  
> -	st->base = devm_ioremap_resource(&pdev->dev, res);
> -	if (IS_ERR(st->base))
> -		return PTR_ERR(st->base);
> -
>  	st->irq = platform_get_irq(pdev, 0);
>  	if (st->irq <= 0) {
>  		if (!st->irq)
diff mbox series

Patch

diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index de9583d6cddd..ad7d9819f83c 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -1764,17 +1764,13 @@  static int at91_adc_probe(struct platform_device *pdev)
 	mutex_init(&st->lock);
 	INIT_WORK(&st->touch_st.workq, at91_adc_workq_handler);
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res)
-		return -EINVAL;
+	st->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
+	if (IS_ERR(st->base))
+		return PTR_ERR(st->base);
 
 	/* if we plan to use DMA, we need the physical address of the regs */
 	st->dma_st.phys_addr = res->start;
 
-	st->base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(st->base))
-		return PTR_ERR(st->base);
-
 	st->irq = platform_get_irq(pdev, 0);
 	if (st->irq <= 0) {
 		if (!st->irq)