Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43f950f4 authored by Nicolin Chen's avatar Nicolin Chen Committed by Linus Torvalds
Browse files

drivers/media/platform/coda.c: use gen_pool_dma_alloc() to allocate iram buffer 



Since gen_pool_dma_alloc() is introduced, we implement it to simplify code.

Signed-off-by: default avatarNicolin Chen <b42378@freescale.com>
Acked-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a6dd30e2

drivers/media/platform/coda.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -3232,13 +3232,12 @@ static int coda_probe(struct platform_device *pdev) 
		dev->iram_size = CODA7_IRAM_SIZE;

		dev->iram_size = CODA7_IRAM_SIZE;

		break;

		break;

	}

	}

	dev->iram_vaddr = gen_pool_alloc(dev->iram_pool, dev->iram_size);

	dev->iram_vaddr = (unsigned long)gen_pool_dma_alloc(dev->iram_pool,

			dev->iram_size, (dma_addr_t *)&dev->iram_paddr);

	if (!dev->iram_vaddr) {

	if (!dev->iram_vaddr) {

		dev_err(&pdev->dev, "unable to alloc iram\n");

		dev_err(&pdev->dev, "unable to alloc iram\n");

		return -ENOMEM;

		return -ENOMEM;

	}

	}

	dev->iram_paddr = gen_pool_virt_to_phys(dev->iram_pool,

						dev->iram_vaddr);





	platform_set_drvdata(pdev, dev);

	platform_set_drvdata(pdev, dev);