diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 06:39:57 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 06:39:57 -0400 |
commit | c563bf0965c86cc6087b09c34ca063fe96d6deca (patch) | |
tree | 59f19de457156a8ba9b68d227e2fa33d58985bd5 /arch/sh/boards/mach-snapgear | |
parent | d556fcc101c4b0d57ac9742ab806a6bfed78eac1 (diff) |
sh: pci: Kill off dead references to is_pci_ioaddr and friends.
Some old boards are still using this in their I/O routines, kill it off.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/mach-snapgear')
-rw-r--r-- | arch/sh/boards/mach-snapgear/io.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/sh/boards/mach-snapgear/io.c b/arch/sh/boards/mach-snapgear/io.c index 0f4824264557..476650e42dbc 100644 --- a/arch/sh/boards/mach-snapgear/io.c +++ b/arch/sh/boards/mach-snapgear/io.c | |||
@@ -36,8 +36,6 @@ unsigned char snapgear_inb(unsigned long port) | |||
36 | { | 36 | { |
37 | if (PXSEG(port)) | 37 | if (PXSEG(port)) |
38 | return *(volatile unsigned char *)port; | 38 | return *(volatile unsigned char *)port; |
39 | else if (is_pci_ioaddr(port)) | ||
40 | return *(volatile unsigned char *)pci_ioaddr(port); | ||
41 | else | 39 | else |
42 | return (*port2adr(port)) & 0xff; | 40 | return (*port2adr(port)) & 0xff; |
43 | } | 41 | } |
@@ -48,8 +46,6 @@ unsigned char snapgear_inb_p(unsigned long port) | |||
48 | 46 | ||
49 | if (PXSEG(port)) | 47 | if (PXSEG(port)) |
50 | v = *(volatile unsigned char *)port; | 48 | v = *(volatile unsigned char *)port; |
51 | else if (is_pci_ioaddr(port)) | ||
52 | v = *(volatile unsigned char *)pci_ioaddr(port); | ||
53 | else | 49 | else |
54 | v = (*port2adr(port))&0xff; | 50 | v = (*port2adr(port))&0xff; |
55 | ctrl_delay(); | 51 | ctrl_delay(); |
@@ -60,8 +56,6 @@ unsigned short snapgear_inw(unsigned long port) | |||
60 | { | 56 | { |
61 | if (PXSEG(port)) | 57 | if (PXSEG(port)) |
62 | return *(volatile unsigned short *)port; | 58 | return *(volatile unsigned short *)port; |
63 | else if (is_pci_ioaddr(port)) | ||
64 | return *(volatile unsigned short *)pci_ioaddr(port); | ||
65 | else if (port >= 0x2000) | 59 | else if (port >= 0x2000) |
66 | return *port2adr(port); | 60 | return *port2adr(port); |
67 | else | 61 | else |
@@ -73,8 +67,6 @@ unsigned int snapgear_inl(unsigned long port) | |||
73 | { | 67 | { |
74 | if (PXSEG(port)) | 68 | if (PXSEG(port)) |
75 | return *(volatile unsigned long *)port; | 69 | return *(volatile unsigned long *)port; |
76 | else if (is_pci_ioaddr(port)) | ||
77 | return *(volatile unsigned int *)pci_ioaddr(port); | ||
78 | else if (port >= 0x2000) | 70 | else if (port >= 0x2000) |
79 | return *port2adr(port); | 71 | return *port2adr(port); |
80 | else | 72 | else |
@@ -87,8 +79,6 @@ void snapgear_outb(unsigned char value, unsigned long port) | |||
87 | 79 | ||
88 | if (PXSEG(port)) | 80 | if (PXSEG(port)) |
89 | *(volatile unsigned char *)port = value; | 81 | *(volatile unsigned char *)port = value; |
90 | else if (is_pci_ioaddr(port)) | ||
91 | *((unsigned char*)pci_ioaddr(port)) = value; | ||
92 | else | 82 | else |
93 | *(port2adr(port)) = value; | 83 | *(port2adr(port)) = value; |
94 | } | 84 | } |
@@ -97,8 +87,6 @@ void snapgear_outb_p(unsigned char value, unsigned long port) | |||
97 | { | 87 | { |
98 | if (PXSEG(port)) | 88 | if (PXSEG(port)) |
99 | *(volatile unsigned char *)port = value; | 89 | *(volatile unsigned char *)port = value; |
100 | else if (is_pci_ioaddr(port)) | ||
101 | *((unsigned char*)pci_ioaddr(port)) = value; | ||
102 | else | 90 | else |
103 | *(port2adr(port)) = value; | 91 | *(port2adr(port)) = value; |
104 | ctrl_delay(); | 92 | ctrl_delay(); |
@@ -108,8 +96,6 @@ void snapgear_outw(unsigned short value, unsigned long port) | |||
108 | { | 96 | { |
109 | if (PXSEG(port)) | 97 | if (PXSEG(port)) |
110 | *(volatile unsigned short *)port = value; | 98 | *(volatile unsigned short *)port = value; |
111 | else if (is_pci_ioaddr(port)) | ||
112 | *((unsigned short *)pci_ioaddr(port)) = value; | ||
113 | else if (port >= 0x2000) | 99 | else if (port >= 0x2000) |
114 | *port2adr(port) = value; | 100 | *port2adr(port) = value; |
115 | else | 101 | else |
@@ -120,8 +106,6 @@ void snapgear_outl(unsigned int value, unsigned long port) | |||
120 | { | 106 | { |
121 | if (PXSEG(port)) | 107 | if (PXSEG(port)) |
122 | *(volatile unsigned long *)port = value; | 108 | *(volatile unsigned long *)port = value; |
123 | else if (is_pci_ioaddr(port)) | ||
124 | *((unsigned long*)pci_ioaddr(port)) = value; | ||
125 | else | 109 | else |
126 | maybebadio(port); | 110 | maybebadio(port); |
127 | } | 111 | } |