diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2011-03-29 06:09:51 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2011-05-10 13:15:23 -0400 |
| commit | 84d3b0dbac103fc1b3aff1e71cb723b5456a849c (patch) | |
| tree | 303c9894d5eb5f98d8a9120a8b1e9e7b6ad92e25 | |
| parent | 11b9d0eca559d087f3d49282033f2865cceacedd (diff) | |
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>
| -rw-r--r-- | arch/mips/jazz/jazzdma.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c index 9ce9f64cb76f..2d8e447cb828 100644 --- a/arch/mips/jazz/jazzdma.c +++ b/arch/mips/jazz/jazzdma.c | |||
| @@ -211,7 +211,7 @@ EXPORT_SYMBOL(vdma_free); | |||
| 211 | */ | 211 | */ |
| 212 | int vdma_remap(unsigned long laddr, unsigned long paddr, unsigned long size) | 212 | int vdma_remap(unsigned long laddr, unsigned long paddr, unsigned long size) |
| 213 | { | 213 | { |
| 214 | int first, pages, npages; | 214 | int first, pages; |
| 215 | 215 | ||
| 216 | if (laddr > 0xffffff) { | 216 | if (laddr > 0xffffff) { |
| 217 | if (vdma_debug) | 217 | if (vdma_debug) |
| @@ -228,8 +228,7 @@ int vdma_remap(unsigned long laddr, unsigned long paddr, unsigned long size) | |||
| 228 | return -EINVAL; /* invalid physical address */ | 228 | return -EINVAL; /* invalid physical address */ |
| 229 | } | 229 | } |
| 230 | 230 | ||
| 231 | npages = pages = | 231 | pages = (((paddr & (VDMA_PAGESIZE - 1)) + size) >> 12) + 1; |
| 232 | (((paddr & (VDMA_PAGESIZE - 1)) + size) >> 12) + 1; | ||
| 233 | first = laddr >> 12; | 232 | first = laddr >> 12; |
| 234 | if (vdma_debug) | 233 | if (vdma_debug) |
| 235 | printk("vdma_remap: first=%x, pages=%x\n", first, pages); | 234 | printk("vdma_remap: first=%x, pages=%x\n", first, pages); |
