diff options
author | Nicolin Chen <b42378@freescale.com> | 2013-11-12 15:09:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 12:09:23 +0900 |
commit | 288342e9cc867421d20f940d0c06b7aa4bf39096 (patch) | |
tree | 06ef620bf8f84ed34d8496db84d97f17d1565bb0 | |
parent | 43f950f454815cca2c39244c7441f9288d7389e0 (diff) | |
download | linux-stable-288342e9cc867421d20f940d0c06b7aa4bf39096.tar.gz linux-stable-288342e9cc867421d20f940d0c06b7aa4bf39096.tar.bz2 linux-stable-288342e9cc867421d20f940d0c06b7aa4bf39096.zip |
drivers/uio/uio_pruss.c: use gen_pool_dma_alloc() to allocate sram memory
Since gen_pool_dma_alloc() is introduced, we implement it to simplify code.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Cc: "Hans J. Koch" <hjk@hansjkoch.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/uio/uio_pruss.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c index f519da9034b7..96c4a19b1918 100644 --- a/drivers/uio/uio_pruss.c +++ b/drivers/uio/uio_pruss.c @@ -158,14 +158,12 @@ static int pruss_probe(struct platform_device *dev) if (pdata->sram_pool) { gdev->sram_pool = pdata->sram_pool; gdev->sram_vaddr = - gen_pool_alloc(gdev->sram_pool, sram_pool_sz); + (unsigned long)gen_pool_dma_alloc(gdev->sram_pool, + sram_pool_sz, &gdev->sram_paddr); if (!gdev->sram_vaddr) { dev_err(&dev->dev, "Could not allocate SRAM pool\n"); goto out_free; } - gdev->sram_paddr = - gen_pool_virt_to_phys(gdev->sram_pool, - gdev->sram_vaddr); } gdev->ddr_vaddr = dma_alloc_coherent(&dev->dev, extram_pool_sz, |