projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a6dd30e
)
drivers/media/platform/coda.c: use gen_pool_dma_alloc() to allocate iram buffer
author
Nicolin Chen
<
[email protected]
>
Tue, 12 Nov 2013 23:09:56 +0000
(15:09 -0800)
committer
Linus Torvalds
<
[email protected]
>
Wed, 13 Nov 2013 03:09:23 +0000
(12:09 +0900)
Since gen_pool_dma_alloc() is introduced, we implement it to simplify code.
Signed-off-by: Nicolin Chen <
[email protected]
>
Acked-by: Mauro Carvalho Chehab <
[email protected]
>
Cc: Grant Likely <
[email protected]
>
Cc: Rob Herring <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/media/platform/coda.c
patch
|
blob
|
history
diff --git
a/drivers/media/platform/coda.c
b/drivers/media/platform/coda.c
index 449d2fec9e87454aa85f34a0642aa61919d376a5..4993610051eeeb586005712060732ef2539390b2 100644
(file)
--- a/
drivers/media/platform/coda.c
+++ b/
drivers/media/platform/coda.c
@@
-3232,13
+3232,12
@@
static int coda_probe(struct platform_device *pdev)
dev->iram_size = CODA7_IRAM_SIZE;
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) {
dev_err(&pdev->dev, "unable to alloc iram\n");
return -ENOMEM;
}
- dev->iram_paddr = gen_pool_virt_to_phys(dev->iram_pool,
- dev->iram_vaddr);
platform_set_drvdata(pdev, dev);