MIPS: Jazz: Fix GCC 4.6.0 build error

CC      arch/mips/jazz/jazzdma.o
arch/mips/jazz/jazzdma.c: In function 'vdma_remap':
arch/mips/jazz/jazzdma.c:214:20: error: variable 'npages' set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2011-03-29 12:09:51 +02:00
parent 11b9d0eca5
commit 84d3b0dbac

View File

@ -211,7 +211,7 @@ EXPORT_SYMBOL(vdma_free);
*/ */
int vdma_remap(unsigned long laddr, unsigned long paddr, unsigned long size) int vdma_remap(unsigned long laddr, unsigned long paddr, unsigned long size)
{ {
int first, pages, npages; int first, pages;
if (laddr > 0xffffff) { if (laddr > 0xffffff) {
if (vdma_debug) if (vdma_debug)
@ -228,8 +228,7 @@ int vdma_remap(unsigned long laddr, unsigned long paddr, unsigned long size)
return -EINVAL; /* invalid physical address */ return -EINVAL; /* invalid physical address */
} }
npages = pages = pages = (((paddr & (VDMA_PAGESIZE - 1)) + size) >> 12) + 1;
(((paddr & (VDMA_PAGESIZE - 1)) + size) >> 12) + 1;
first = laddr >> 12; first = laddr >> 12;
if (vdma_debug) if (vdma_debug)
printk("vdma_remap: first=%x, pages=%x\n", first, pages); printk("vdma_remap: first=%x, pages=%x\n", first, pages);