diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2009-11-30 12:10:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-30 12:10:41 +0900 |
| commit | 9cdae914b2d08febca6e6e0440817d60da115ba5 (patch) | |
| tree | b52fd2a2e3f081e2d735544e8c9184dd8e8235ab /drivers/sh | |
| parent | sh: Improve kfr2r09 serial port setup code (diff) | |
| download | linux-dev-9cdae914b2d08febca6e6e0440817d60da115ba5.tar.xz linux-dev-9cdae914b2d08febca6e6e0440817d60da115ba5.zip | |
sh: pfc: Convert from ctrl_xxx() to __raw_xxx() I/O routines.
Now that the PFC code is exposed for other architectures, use the common
__raw_xxx() routines instead of the ctrl_xxx() ones. This will be needed
for ARM-based SH-Mobiles amongst others.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
| -rw-r--r-- | drivers/sh/pfc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/sh/pfc.c b/drivers/sh/pfc.c index d22e5af699f9..448ba232c408 100644 --- a/drivers/sh/pfc.c +++ b/drivers/sh/pfc.c @@ -35,11 +35,11 @@ static unsigned long gpio_read_raw_reg(unsigned long reg, { switch (reg_width) { case 8: - return ctrl_inb(reg); + return __raw_readb(reg); case 16: - return ctrl_inw(reg); + return __raw_readw(reg); case 32: - return ctrl_inl(reg); + return __raw_readl(reg); } BUG(); @@ -52,13 +52,13 @@ static void gpio_write_raw_reg(unsigned long reg, { switch (reg_width) { case 8: - ctrl_outb(data, reg); + __raw_writeb(data, reg); return; case 16: - ctrl_outw(data, reg); + __raw_writew(data, reg); return; case 32: - ctrl_outl(data, reg); + __raw_writel(data, reg); return; } @@ -125,13 +125,13 @@ static void gpio_write_reg(unsigned long reg, unsigned long reg_width, switch (reg_width) { case 8: - ctrl_outb((ctrl_inb(reg) & mask) | value, reg); + __raw_writeb((__raw_readb(reg) & mask) | value, reg); break; case 16: - ctrl_outw((ctrl_inw(reg) & mask) | value, reg); + __raw_writew((__raw_readw(reg) & mask) | value, reg); break; case 32: - ctrl_outl((ctrl_inl(reg) & mask) | value, reg); + __raw_writel((__raw_readl(reg) & mask) | value, reg); break; } } |