Commit 4b23603a authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Vinod Koul
Browse files

dmaengine: drivers: Use devm_platform_ioremap_resource() 



platform_get_resource() and devm_ioremap_resource() are wrapped up in the
devm_platform_ioremap_resource() helper. Use the helper and get rid of the
local variable for struct resource *. We now have a function call less.

Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@gmail.com>
Link: https://lore.kernel.org/r/20221110152528.7821-1-tudor.ambarus@microchip.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 531d4dfc

drivers/dma/bcm2835-dma.c

+1 −3
Original line number Diff line number Diff line
@@ -878,7 +878,6 @@ static struct dma_chan *bcm2835_dma_xlate(struct of_phandle_args *spec, 
static int bcm2835_dma_probe(struct platform_device *pdev)

{

	struct bcm2835_dmadev *od;

	struct resource *res;

	void __iomem *base;

	int rc;

	int i, j;
@@ -902,8 +901,7 @@ static int bcm2835_dma_probe(struct platform_device *pdev) 


	dma_set_max_seg_size(&pdev->dev, 0x3FFFFFFF);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base = devm_ioremap_resource(&pdev->dev, res);

	base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(base))

		return PTR_ERR(base);

drivers/dma/dma-axi-dmac.c

+1 −3
Original line number Diff line number Diff line
@@ -910,7 +910,6 @@ static int axi_dmac_probe(struct platform_device *pdev) 
{

	struct dma_device *dma_dev;

	struct axi_dmac *dmac;

	struct resource *res;

	struct regmap *regmap;

	unsigned int version;

	int ret;
@@ -925,8 +924,7 @@ static int axi_dmac_probe(struct platform_device *pdev) 
	if (dmac->irq == 0)

		return -EINVAL;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	dmac->base = devm_ioremap_resource(&pdev->dev, res);

	dmac->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(dmac->base))

		return PTR_ERR(dmac->base);

drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c

+1 −3
Original line number Diff line number Diff line
@@ -1365,7 +1365,6 @@ static int dw_probe(struct platform_device *pdev) 
{

	struct device_node *node = pdev->dev.of_node;

	struct axi_dma_chip *chip;

	struct resource *mem;

	struct dw_axi_dma *dw;

	struct dw_axi_dma_hcfg *hdata;

	u32 i;
@@ -1391,8 +1390,7 @@ static int dw_probe(struct platform_device *pdev) 
	if (chip->irq < 0)

		return chip->irq;



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	chip->regs = devm_ioremap_resource(chip->dev, mem);

	chip->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(chip->regs))

		return PTR_ERR(chip->regs);

drivers/dma/fsl-edma.c

+3 −5
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ static int fsl_edma_probe(struct platform_device *pdev) 
	const struct fsl_edma_drvdata *drvdata = NULL;

	struct fsl_edma_chan *fsl_chan;

	struct edma_regs *regs;

	struct resource *res;

	int len, chans;

	int ret, i;
@@ -298,8 +297,7 @@ static int fsl_edma_probe(struct platform_device *pdev) 
	fsl_edma->n_chans = chans;

	mutex_init(&fsl_edma->fsl_edma_mutex);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	fsl_edma->membase = devm_ioremap_resource(&pdev->dev, res);

	fsl_edma->membase = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(fsl_edma->membase))

		return PTR_ERR(fsl_edma->membase);
@@ -323,8 +321,8 @@ static int fsl_edma_probe(struct platform_device *pdev) 
	for (i = 0; i < fsl_edma->drvdata->dmamuxs; i++) {

		char clkname[32];



		res = platform_get_resource(pdev, IORESOURCE_MEM, 1 + i);

		fsl_edma->muxbase[i] = devm_ioremap_resource(&pdev->dev, res);

		fsl_edma->muxbase[i] = devm_platform_ioremap_resource(pdev,

								      1 + i);

		if (IS_ERR(fsl_edma->muxbase[i])) {

			/* on error: disable all previously enabled clks */

			fsl_disable_clocks(fsl_edma, i);

drivers/dma/fsl-qdma.c

+3 −7
Original line number Diff line number Diff line
@@ -1119,7 +1119,6 @@ static int fsl_qdma_probe(struct platform_device *pdev) 
	int ret, i;

	int blk_num, blk_off;

	u32 len, chans, queues;

	struct resource *res;

	struct fsl_qdma_chan *fsl_chan;

	struct fsl_qdma_engine *fsl_qdma;

	struct device_node *np = pdev->dev.of_node;
@@ -1183,18 +1182,15 @@ static int fsl_qdma_probe(struct platform_device *pdev) 
		if (!fsl_qdma->status[i])

			return -ENOMEM;

	}

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	fsl_qdma->ctrl_base = devm_ioremap_resource(&pdev->dev, res);

	fsl_qdma->ctrl_base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(fsl_qdma->ctrl_base))

		return PTR_ERR(fsl_qdma->ctrl_base);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	fsl_qdma->status_base = devm_ioremap_resource(&pdev->dev, res);

	fsl_qdma->status_base = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(fsl_qdma->status_base))

		return PTR_ERR(fsl_qdma->status_base);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 2);

	fsl_qdma->block_base = devm_ioremap_resource(&pdev->dev, res);

	fsl_qdma->block_base = devm_platform_ioremap_resource(pdev, 2);

	if (IS_ERR(fsl_qdma->block_base))

		return PTR_ERR(fsl_qdma->block_base);

	fsl_qdma->queue = fsl_qdma_alloc_queue_resources(pdev, fsl_qdma);