diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/io.h | 13 | ||||
-rw-r--r-- | include/asm-ppc/io.h | 10 | ||||
-rw-r--r-- | include/asm-ppc/mpc8260_pci9.h | 4 |
3 files changed, 1 insertions, 26 deletions
diff --git a/include/asm-powerpc/io.h b/include/asm-powerpc/io.h index 212428db0d8b..9aaced542624 100644 --- a/include/asm-powerpc/io.h +++ b/include/asm-powerpc/io.h | |||
@@ -76,8 +76,7 @@ extern unsigned long pci_io_base; | |||
76 | #define insb(port, buf, ns) _insb((u8 __iomem *)((port)+pci_io_base), (buf), (ns)) | 76 | #define insb(port, buf, ns) _insb((u8 __iomem *)((port)+pci_io_base), (buf), (ns)) |
77 | #define insw(port, buf, ns) _insw_ns((u8 __iomem *)((port)+pci_io_base), (buf), (ns)) | 77 | #define insw(port, buf, ns) _insw_ns((u8 __iomem *)((port)+pci_io_base), (buf), (ns)) |
78 | #define insl(port, buf, nl) _insl_ns((u8 __iomem *)((port)+pci_io_base), (buf), (nl)) | 78 | #define insl(port, buf, nl) _insl_ns((u8 __iomem *)((port)+pci_io_base), (buf), (nl)) |
79 | #define insw_ns(port, buf, ns) _insw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns)) | 79 | |
80 | #define insl_ns(port, buf, nl) _insl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl)) | ||
81 | #else | 80 | #else |
82 | 81 | ||
83 | static inline unsigned char __raw_readb(const volatile void __iomem *addr) | 82 | static inline unsigned char __raw_readb(const volatile void __iomem *addr) |
@@ -138,8 +137,6 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr) | |||
138 | #define insb(port, buf, ns) eeh_insb((port), (buf), (ns)) | 137 | #define insb(port, buf, ns) eeh_insb((port), (buf), (ns)) |
139 | #define insw(port, buf, ns) eeh_insw_ns((port), (buf), (ns)) | 138 | #define insw(port, buf, ns) eeh_insw_ns((port), (buf), (ns)) |
140 | #define insl(port, buf, nl) eeh_insl_ns((port), (buf), (nl)) | 139 | #define insl(port, buf, nl) eeh_insl_ns((port), (buf), (nl)) |
141 | #define insw_ns(port, buf, ns) eeh_insw_ns((port), (buf), (ns)) | ||
142 | #define insl_ns(port, buf, nl) eeh_insl_ns((port), (buf), (nl)) | ||
143 | 140 | ||
144 | #endif | 141 | #endif |
145 | 142 | ||
@@ -180,14 +177,6 @@ static inline void mmiowb(void) | |||
180 | #define inl_p(port) inl(port) | 177 | #define inl_p(port) inl(port) |
181 | #define outl_p(val, port) (udelay(1), outl((val), (port))) | 178 | #define outl_p(val, port) (udelay(1), outl((val), (port))) |
182 | 179 | ||
183 | /* | ||
184 | * The *_ns versions below don't do byte-swapping. | ||
185 | * Neither do the standard versions now, these are just here | ||
186 | * for older code. | ||
187 | */ | ||
188 | #define outsw_ns(port, buf, ns) _outsw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns)) | ||
189 | #define outsl_ns(port, buf, nl) _outsl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl)) | ||
190 | |||
191 | 180 | ||
192 | #define IO_SPACE_LIMIT ~(0UL) | 181 | #define IO_SPACE_LIMIT ~(0UL) |
193 | 182 | ||
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index 680555be22ec..fb0a8fcc51cf 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h | |||
@@ -338,16 +338,6 @@ extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns); | |||
338 | extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl); | 338 | extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl); |
339 | extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl); | 339 | extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl); |
340 | 340 | ||
341 | /* | ||
342 | * The *_ns versions below don't do byte-swapping. | ||
343 | * Neither do the standard versions now, these are just here | ||
344 | * for older code. | ||
345 | */ | ||
346 | #define insw_ns(port, buf, ns) _insw_ns((port)+___IO_BASE, (buf), (ns)) | ||
347 | #define outsw_ns(port, buf, ns) _outsw_ns((port)+___IO_BASE, (buf), (ns)) | ||
348 | #define insl_ns(port, buf, nl) _insl_ns((port)+___IO_BASE, (buf), (nl)) | ||
349 | #define outsl_ns(port, buf, nl) _outsl_ns((port)+___IO_BASE, (buf), (nl)) | ||
350 | |||
351 | 341 | ||
352 | #define IO_SPACE_LIMIT ~0 | 342 | #define IO_SPACE_LIMIT ~0 |
353 | 343 | ||
diff --git a/include/asm-ppc/mpc8260_pci9.h b/include/asm-ppc/mpc8260_pci9.h index 26b3f6e787bc..9f7176881c56 100644 --- a/include/asm-ppc/mpc8260_pci9.h +++ b/include/asm-ppc/mpc8260_pci9.h | |||
@@ -30,8 +30,6 @@ | |||
30 | #undef inb | 30 | #undef inb |
31 | #undef inw | 31 | #undef inw |
32 | #undef inl | 32 | #undef inl |
33 | #undef insw_ns | ||
34 | #undef insl_ns | ||
35 | #undef memcpy_fromio | 33 | #undef memcpy_fromio |
36 | 34 | ||
37 | extern int readb(volatile unsigned char *addr); | 35 | extern int readb(volatile unsigned char *addr); |
@@ -43,8 +41,6 @@ extern void insl(unsigned port, void *buf, int nl); | |||
43 | extern int inb(unsigned port); | 41 | extern int inb(unsigned port); |
44 | extern int inw(unsigned port); | 42 | extern int inw(unsigned port); |
45 | extern unsigned inl(unsigned port); | 43 | extern unsigned inl(unsigned port); |
46 | extern void insw_ns(unsigned port, void *buf, int ns); | ||
47 | extern void insl_ns(unsigned port, void *buf, int nl); | ||
48 | extern void *memcpy_fromio(void *dest, unsigned long src, size_t count); | 44 | extern void *memcpy_fromio(void *dest, unsigned long src, size_t count); |
49 | 45 | ||
50 | #endif /* !__CONFIG_8260_PCI9_DEFS */ | 46 | #endif /* !__CONFIG_8260_PCI9_DEFS */ |