[POWERPC] remove unused io accessors
The io accessors insw_ns, outsw_ns, insl_ns and outsl_ns are unused (except for one unnecessary use in drivers/net/3c509.c that is addressed in a previous patch) and are only defined in powerpc/ppc, so remove them. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
This commit is contained in:
@@ -339,20 +339,6 @@ void insl(unsigned port, void *buf, int nl)
|
|||||||
idma_pci9_read((u8 *)buf, (u8 *)addr, nl*sizeof(u32), sizeof(u32), 0);
|
idma_pci9_read((u8 *)buf, (u8 *)addr, nl*sizeof(u32), sizeof(u32), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void insw_ns(unsigned port, void *buf, int ns)
|
|
||||||
{
|
|
||||||
u8 *addr = (u8 *)(port + _IO_BASE);
|
|
||||||
|
|
||||||
idma_pci9_read((u8 *)buf, (u8 *)addr, ns*sizeof(u16), sizeof(u16), 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void insl_ns(unsigned port, void *buf, int nl)
|
|
||||||
{
|
|
||||||
u8 *addr = (u8 *)(port + _IO_BASE);
|
|
||||||
|
|
||||||
idma_pci9_read((u8 *)buf, (u8 *)addr, nl*sizeof(u32), sizeof(u32), 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void *memcpy_fromio(void *dest, unsigned long src, size_t count)
|
void *memcpy_fromio(void *dest, unsigned long src, size_t count)
|
||||||
{
|
{
|
||||||
unsigned long pa = iopa((unsigned long) src);
|
unsigned long pa = iopa((unsigned long) src);
|
||||||
@@ -373,8 +359,6 @@ EXPORT_SYMBOL(inl);
|
|||||||
EXPORT_SYMBOL(insb);
|
EXPORT_SYMBOL(insb);
|
||||||
EXPORT_SYMBOL(insw);
|
EXPORT_SYMBOL(insw);
|
||||||
EXPORT_SYMBOL(insl);
|
EXPORT_SYMBOL(insl);
|
||||||
EXPORT_SYMBOL(insw_ns);
|
|
||||||
EXPORT_SYMBOL(insl_ns);
|
|
||||||
EXPORT_SYMBOL(memcpy_fromio);
|
EXPORT_SYMBOL(memcpy_fromio);
|
||||||
|
|
||||||
#endif /* ifdef CONFIG_8260_PCI9 */
|
#endif /* ifdef CONFIG_8260_PCI9 */
|
||||||
|
@@ -76,8 +76,7 @@ extern unsigned long pci_io_base;
|
|||||||
#define insb(port, buf, ns) _insb((u8 __iomem *)((port)+pci_io_base), (buf), (ns))
|
#define insb(port, buf, ns) _insb((u8 __iomem *)((port)+pci_io_base), (buf), (ns))
|
||||||
#define insw(port, buf, ns) _insw_ns((u8 __iomem *)((port)+pci_io_base), (buf), (ns))
|
#define insw(port, buf, ns) _insw_ns((u8 __iomem *)((port)+pci_io_base), (buf), (ns))
|
||||||
#define insl(port, buf, nl) _insl_ns((u8 __iomem *)((port)+pci_io_base), (buf), (nl))
|
#define insl(port, buf, nl) _insl_ns((u8 __iomem *)((port)+pci_io_base), (buf), (nl))
|
||||||
#define insw_ns(port, buf, ns) _insw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))
|
|
||||||
#define insl_ns(port, buf, nl) _insl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
static inline unsigned char __raw_readb(const volatile void __iomem *addr)
|
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)
|
|||||||
#define insb(port, buf, ns) eeh_insb((port), (buf), (ns))
|
#define insb(port, buf, ns) eeh_insb((port), (buf), (ns))
|
||||||
#define insw(port, buf, ns) eeh_insw_ns((port), (buf), (ns))
|
#define insw(port, buf, ns) eeh_insw_ns((port), (buf), (ns))
|
||||||
#define insl(port, buf, nl) eeh_insl_ns((port), (buf), (nl))
|
#define insl(port, buf, nl) eeh_insl_ns((port), (buf), (nl))
|
||||||
#define insw_ns(port, buf, ns) eeh_insw_ns((port), (buf), (ns))
|
|
||||||
#define insl_ns(port, buf, nl) eeh_insl_ns((port), (buf), (nl))
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -180,14 +177,6 @@ static inline void mmiowb(void)
|
|||||||
#define inl_p(port) inl(port)
|
#define inl_p(port) inl(port)
|
||||||
#define outl_p(val, port) (udelay(1), outl((val), (port)))
|
#define outl_p(val, port) (udelay(1), outl((val), (port)))
|
||||||
|
|
||||||
/*
|
|
||||||
* The *_ns versions below don't do byte-swapping.
|
|
||||||
* Neither do the standard versions now, these are just here
|
|
||||||
* for older code.
|
|
||||||
*/
|
|
||||||
#define outsw_ns(port, buf, ns) _outsw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))
|
|
||||||
#define outsl_ns(port, buf, nl) _outsl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))
|
|
||||||
|
|
||||||
|
|
||||||
#define IO_SPACE_LIMIT ~(0UL)
|
#define IO_SPACE_LIMIT ~(0UL)
|
||||||
|
|
||||||
|
@@ -338,16 +338,6 @@ extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);
|
|||||||
extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);
|
extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);
|
||||||
extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl);
|
extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl);
|
||||||
|
|
||||||
/*
|
|
||||||
* The *_ns versions below don't do byte-swapping.
|
|
||||||
* Neither do the standard versions now, these are just here
|
|
||||||
* for older code.
|
|
||||||
*/
|
|
||||||
#define insw_ns(port, buf, ns) _insw_ns((port)+___IO_BASE, (buf), (ns))
|
|
||||||
#define outsw_ns(port, buf, ns) _outsw_ns((port)+___IO_BASE, (buf), (ns))
|
|
||||||
#define insl_ns(port, buf, nl) _insl_ns((port)+___IO_BASE, (buf), (nl))
|
|
||||||
#define outsl_ns(port, buf, nl) _outsl_ns((port)+___IO_BASE, (buf), (nl))
|
|
||||||
|
|
||||||
|
|
||||||
#define IO_SPACE_LIMIT ~0
|
#define IO_SPACE_LIMIT ~0
|
||||||
|
|
||||||
|
@@ -30,8 +30,6 @@
|
|||||||
#undef inb
|
#undef inb
|
||||||
#undef inw
|
#undef inw
|
||||||
#undef inl
|
#undef inl
|
||||||
#undef insw_ns
|
|
||||||
#undef insl_ns
|
|
||||||
#undef memcpy_fromio
|
#undef memcpy_fromio
|
||||||
|
|
||||||
extern int readb(volatile unsigned char *addr);
|
extern int readb(volatile unsigned char *addr);
|
||||||
@@ -43,8 +41,6 @@ extern void insl(unsigned port, void *buf, int nl);
|
|||||||
extern int inb(unsigned port);
|
extern int inb(unsigned port);
|
||||||
extern int inw(unsigned port);
|
extern int inw(unsigned port);
|
||||||
extern unsigned inl(unsigned port);
|
extern unsigned inl(unsigned port);
|
||||||
extern void insw_ns(unsigned port, void *buf, int ns);
|
|
||||||
extern void insl_ns(unsigned port, void *buf, int nl);
|
|
||||||
extern void *memcpy_fromio(void *dest, unsigned long src, size_t count);
|
extern void *memcpy_fromio(void *dest, unsigned long src, size_t count);
|
||||||
|
|
||||||
#endif /* !__CONFIG_8260_PCI9_DEFS */
|
#endif /* !__CONFIG_8260_PCI9_DEFS */
|
||||||
|
Reference in New Issue
Block a user