[PATCH 27/33] dmaengine: at_hdmac: Use devm_platform_ioremap_resource

Tudor Ambarus
2022-08-20T13:00:42Z

Use devm_platform_ioremap_resource() helper for cleanner code and easier
resource management.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
drivers/dma/at_hdmac.c | 37 ++++++-------------------------------
1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 85808cfda3cc..9c414f167b62 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -2208,9 +2208,7 @@ static void at_dma_off(struct at_dma *atdma)

static int __init at_dma_probe(struct platform_device *pdev)
{
- struct resource *io;
struct at_dma *atdma;
- size_t size;
int irq;
int err;
int i;
@@ -2236,9 +2234,9 @@ static int __init at_dma_probe(struct platform_device *pdev)
if (!atdma)
return -ENOMEM;

- io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!io)
- return -EINVAL;
+ atdma->regs = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(atdma->regs))
+ return PTR_ERR(atdma->regs);

irq = platform_get_irq(pdev, 0);
if (irq < 0)
@@ -2248,21 +2246,10 @@ static int __init at_dma_probe(struct platform_device *pdev)
atdma->dma_device.cap_mask = plat_dat->cap_mask;
atdma->all_chan_mask = (1 << plat_dat->nr_channels) - 1;

- size = resource_size(io);
- if (!request_mem_region(io->start, size, pdev->dev.driver->name))
- return -EBUSY;
-
- atdma->regs = ioremap(io->start, size);
- if (!atdma->regs) {
- err = -ENOMEM;
- goto err_release_r;
- }
-
atdma->clk = clk_get(&pdev->dev, "dma_clk");
- if (IS_ERR(atdma->clk)) {
- err = PTR_ERR(atdma->clk);
- goto err_clk;
- }
+ if (IS_ERR(atdma->clk))
+ return PTR_ERR(atdma->clk);
+
err = clk_prepare_enable(atdma->clk);
if (err)
goto err_clk_prepare;
@@ -2395,11 +2382,6 @@ static int __init at_dma_probe(struct platform_device *pdev)
clk_disable_unprepare(atdma->clk);
err_clk_prepare:
clk_put(atdma->clk);
-err_clk:
- iounmap(atdma->regs);
- atdma->regs = NULL;
-err_release_r:
- release_mem_region(io->start, size);
return err;
}

@@ -2407,7 +2389,6 @@ static int at_dma_remove(struct platform_device *pdev)
{
struct at_dma *atdma = platform_get_drvdata(pdev);
struct dma_chan *chan, *_chan;
- struct resource *io;

at_dma_off(atdma);
if (pdev->dev.of_node)
@@ -2432,12 +2413,6 @@ static int at_dma_remove(struct platform_device *pdev)
clk_disable_unprepare(atdma->clk);
clk_put(atdma->clk);

- iounmap(atdma->regs);
- atdma->regs = NULL;
-
- io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(io->start, resource_size(io));
-
return 0;
}

--
2.25.1