diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-06-03 21:53:00 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-06-03 21:53:00 -0400 |
| commit | 63dfc3c77b6a99cc618e0a11b7532a56e2699320 (patch) | |
| tree | d141d125f82f6b419e7e2ba9f5bab5e6b8e97a90 /arch | |
| parent | 907c9d70042e38efc6a981d425a3d8d98b089cba (diff) | |
sh: voyagergx: Fix build warnings.
pr_debug() was using a %x on an unsigned long, which was making
the build a bit noisy.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/cchips/voyagergx/irq.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c index 70f12907647f..d70e5c8461b5 100644 --- a/arch/sh/cchips/voyagergx/irq.c +++ b/arch/sh/cchips/voyagergx/irq.c | |||
| @@ -28,7 +28,7 @@ static void disable_voyagergx_irq(unsigned int irq) | |||
| 28 | unsigned long val; | 28 | unsigned long val; |
| 29 | unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE); | 29 | unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE); |
| 30 | 30 | ||
| 31 | pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask); | 31 | pr_debug("disable_voyagergx_irq(%d): mask=%lx\n", irq, mask); |
| 32 | val = readl((void __iomem *)VOYAGER_INT_MASK); | 32 | val = readl((void __iomem *)VOYAGER_INT_MASK); |
| 33 | val &= ~mask; | 33 | val &= ~mask; |
| 34 | writel(val, (void __iomem *)VOYAGER_INT_MASK); | 34 | writel(val, (void __iomem *)VOYAGER_INT_MASK); |
| @@ -39,7 +39,7 @@ static void enable_voyagergx_irq(unsigned int irq) | |||
| 39 | unsigned long val; | 39 | unsigned long val; |
| 40 | unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE); | 40 | unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE); |
| 41 | 41 | ||
| 42 | pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask); | 42 | pr_debug("disable_voyagergx_irq(%d): mask=%lx\n", irq, mask); |
| 43 | val = readl((void __iomem *)VOYAGER_INT_MASK); | 43 | val = readl((void __iomem *)VOYAGER_INT_MASK); |
| 44 | val |= mask; | 44 | val |= mask; |
| 45 | writel(val, (void __iomem *)VOYAGER_INT_MASK); | 45 | writel(val, (void __iomem *)VOYAGER_INT_MASK); |
| @@ -125,11 +125,12 @@ int voyagergx_irq_demux(int irq) | |||
| 125 | i = 17; | 125 | i = 17; |
| 126 | else | 126 | else |
| 127 | printk("Unexpected IRQ irq = %d status = 0x%08lx\n", irq, val); | 127 | printk("Unexpected IRQ irq = %d status = 0x%08lx\n", irq, val); |
| 128 | pr_debug("voyagergx_irq_demux %d \n", i); | 128 | pr_debug("voyagergx_irq_demux %ld \n", i); |
| 129 | if (i < VOYAGER_IRQ_NUM) { | 129 | if (i < VOYAGER_IRQ_NUM) { |
| 130 | irq = VOYAGER_IRQ_BASE + i; | 130 | irq = VOYAGER_IRQ_BASE + i; |
| 131 | if (voyagergx_demux[i].func != 0) | 131 | if (voyagergx_demux[i].func != 0) |
| 132 | irq = voyagergx_demux[i].func(irq, voyagergx_demux[i].dev); | 132 | irq = voyagergx_demux[i].func(irq, |
| 133 | voyagergx_demux[i].dev); | ||
| 133 | } | 134 | } |
| 134 | } | 135 | } |
| 135 | return irq; | 136 | return irq; |
