aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mach-titan/io.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh/boards/mach-titan/io.c')
-rw-r--r--arch/sh/boards/mach-titan/io.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/sh/boards/mach-titan/io.c b/arch/sh/boards/mach-titan/io.c
index 0130e9826aca..29754c5091f0 100644
--- a/arch/sh/boards/mach-titan/io.c
+++ b/arch/sh/boards/mach-titan/io.c
@@ -16,8 +16,8 @@ static inline unsigned int port2adr(unsigned int port)
16u8 titan_inb(unsigned long port) 16u8 titan_inb(unsigned long port)
17{ 17{
18 if (PXSEG(port)) 18 if (PXSEG(port))
19 return ctrl_inb(port); 19 return __raw_readb(port);
20 return ctrl_inw(port2adr(port)) & 0xff; 20 return __raw_readw(port2adr(port)) & 0xff;
21} 21}
22 22
23u8 titan_inb_p(unsigned long port) 23u8 titan_inb_p(unsigned long port)
@@ -25,9 +25,9 @@ u8 titan_inb_p(unsigned long port)
25 u8 v; 25 u8 v;
26 26
27 if (PXSEG(port)) 27 if (PXSEG(port))
28 v = ctrl_inb(port); 28 v = __raw_readb(port);
29 else 29 else
30 v = ctrl_inw(port2adr(port)) & 0xff; 30 v = __raw_readw(port2adr(port)) & 0xff;
31 ctrl_delay(); 31 ctrl_delay();
32 return v; 32 return v;
33} 33}
@@ -35,9 +35,9 @@ u8 titan_inb_p(unsigned long port)
35u16 titan_inw(unsigned long port) 35u16 titan_inw(unsigned long port)
36{ 36{
37 if (PXSEG(port)) 37 if (PXSEG(port))
38 return ctrl_inw(port); 38 return __raw_readw(port);
39 else if (port >= 0x2000) 39 else if (port >= 0x2000)
40 return ctrl_inw(port2adr(port)); 40 return __raw_readw(port2adr(port));
41 else 41 else
42 maybebadio(port); 42 maybebadio(port);
43 return 0; 43 return 0;
@@ -46,9 +46,9 @@ u16 titan_inw(unsigned long port)
46u32 titan_inl(unsigned long port) 46u32 titan_inl(unsigned long port)
47{ 47{
48 if (PXSEG(port)) 48 if (PXSEG(port))
49 return ctrl_inl(port); 49 return __raw_readl(port);
50 else if (port >= 0x2000) 50 else if (port >= 0x2000)
51 return ctrl_inw(port2adr(port)); 51 return __raw_readw(port2adr(port));
52 else 52 else
53 maybebadio(port); 53 maybebadio(port);
54 return 0; 54 return 0;
@@ -57,26 +57,26 @@ u32 titan_inl(unsigned long port)
57void titan_outb(u8 value, unsigned long port) 57void titan_outb(u8 value, unsigned long port)
58{ 58{
59 if (PXSEG(port)) 59 if (PXSEG(port))
60 ctrl_outb(value, port); 60 __raw_writeb(value, port);
61 else 61 else
62 ctrl_outw(value, port2adr(port)); 62 __raw_writew(value, port2adr(port));
63} 63}
64 64
65void titan_outb_p(u8 value, unsigned long port) 65void titan_outb_p(u8 value, unsigned long port)
66{ 66{
67 if (PXSEG(port)) 67 if (PXSEG(port))
68 ctrl_outb(value, port); 68 __raw_writeb(value, port);
69 else 69 else
70 ctrl_outw(value, port2adr(port)); 70 __raw_writew(value, port2adr(port));
71 ctrl_delay(); 71 ctrl_delay();
72} 72}
73 73
74void titan_outw(u16 value, unsigned long port) 74void titan_outw(u16 value, unsigned long port)
75{ 75{
76 if (PXSEG(port)) 76 if (PXSEG(port))
77 ctrl_outw(value, port); 77 __raw_writew(value, port);
78 else if (port >= 0x2000) 78 else if (port >= 0x2000)
79 ctrl_outw(value, port2adr(port)); 79 __raw_writew(value, port2adr(port));
80 else 80 else
81 maybebadio(port); 81 maybebadio(port);
82} 82}
@@ -84,7 +84,7 @@ void titan_outw(u16 value, unsigned long port)
84void titan_outl(u32 value, unsigned long port) 84void titan_outl(u32 value, unsigned long port)
85{ 85{
86 if (PXSEG(port)) 86 if (PXSEG(port))
87 ctrl_outl(value, port); 87 __raw_writel(value, port);
88 else 88 else
89 maybebadio(port); 89 maybebadio(port);
90} 90}