diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-11-29 22:10:41 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-29 22:10:41 -0500 |
commit | 9cdae914b2d08febca6e6e0440817d60da115ba5 (patch) | |
tree | b52fd2a2e3f081e2d735544e8c9184dd8e8235ab | |
parent | e6d8460aca6311d7ab5371b59dc999bb4d714444 (diff) |
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>
-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, | |||
35 | { | 35 | { |
36 | switch (reg_width) { | 36 | switch (reg_width) { |
37 | case 8: | 37 | case 8: |
38 | return ctrl_inb(reg); | 38 | return __raw_readb(reg); |
39 | case 16: | 39 | case 16: |
40 | return ctrl_inw(reg); | 40 | return __raw_readw(reg); |
41 | case 32: | 41 | case 32: |
42 | return ctrl_inl(reg); | 42 | return __raw_readl(reg); |
43 | } | 43 | } |
44 | 44 | ||
45 | BUG(); | 45 | BUG(); |
@@ -52,13 +52,13 @@ static void gpio_write_raw_reg(unsigned long reg, | |||
52 | { | 52 | { |
53 | switch (reg_width) { | 53 | switch (reg_width) { |
54 | case 8: | 54 | case 8: |
55 | ctrl_outb(data, reg); | 55 | __raw_writeb(data, reg); |
56 | return; | 56 | return; |
57 | case 16: | 57 | case 16: |
58 | ctrl_outw(data, reg); | 58 | __raw_writew(data, reg); |
59 | return; | 59 | return; |
60 | case 32: | 60 | case 32: |
61 | ctrl_outl(data, reg); | 61 | __raw_writel(data, reg); |
62 | return; | 62 | return; |
63 | } | 63 | } |
64 | 64 | ||
@@ -125,13 +125,13 @@ static void gpio_write_reg(unsigned long reg, unsigned long reg_width, | |||
125 | 125 | ||
126 | switch (reg_width) { | 126 | switch (reg_width) { |
127 | case 8: | 127 | case 8: |
128 | ctrl_outb((ctrl_inb(reg) & mask) | value, reg); | 128 | __raw_writeb((__raw_readb(reg) & mask) | value, reg); |
129 | break; | 129 | break; |
130 | case 16: | 130 | case 16: |
131 | ctrl_outw((ctrl_inw(reg) & mask) | value, reg); | 131 | __raw_writew((__raw_readw(reg) & mask) | value, reg); |
132 | break; | 132 | break; |
133 | case 32: | 133 | case 32: |
134 | ctrl_outl((ctrl_inl(reg) & mask) | value, reg); | 134 | __raw_writel((__raw_readl(reg) & mask) | value, reg); |
135 | break; | 135 | break; |
136 | } | 136 | } |
137 | } | 137 | } |