diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-01 08:19:10 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-01 08:19:10 +0200 |
| commit | 62429e03644833693e6f94afe537f252e2d3b475 (patch) | |
| tree | d2c3c3139fb7d2e86480ab3f55c7b976d4becf16 /arch/sh/kernel/cpu/irq/ipr.c | |
| parent | sh: Fix up the __raw_read/writeX() definitions. (diff) | |
| download | linux-62429e03644833693e6f94afe537f252e2d3b475.tar.xz linux-62429e03644833693e6f94afe537f252e2d3b475.zip | |
sh: Use __raw_xxx() I/O accessors for INTC and IPR.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/irq/ipr.c')
| -rw-r--r-- | arch/sh/kernel/cpu/irq/ipr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/irq/ipr.c b/arch/sh/kernel/cpu/irq/ipr.c index 56ea7b269b59..3eb17ee5540e 100644 --- a/arch/sh/kernel/cpu/irq/ipr.c +++ b/arch/sh/kernel/cpu/irq/ipr.c @@ -33,7 +33,7 @@ static void disable_ipr_irq(unsigned int irq) struct ipr_data *p = get_irq_chip_data(irq); unsigned long addr = get_ipr_desc(irq)->ipr_offsets[p->ipr_idx]; /* Set the priority in IPR to 0 */ - ctrl_outw(ctrl_inw(addr) & (0xffff ^ (0xf << p->shift)), addr); + __raw_writew(__raw_readw(addr) & (0xffff ^ (0xf << p->shift)), addr); } static void enable_ipr_irq(unsigned int irq) @@ -41,7 +41,7 @@ static void enable_ipr_irq(unsigned int irq) struct ipr_data *p = get_irq_chip_data(irq); unsigned long addr = get_ipr_desc(irq)->ipr_offsets[p->ipr_idx]; /* Set priority in IPR back to original value */ - ctrl_outw(ctrl_inw(addr) | (p->priority << p->shift), addr); + __raw_writew(__raw_readw(addr) | (p->priority << p->shift), addr); } /* |