Commit 76c7d430 authored by Michael Ellerman's avatar Michael Ellerman Committed by Madhavan Srinivasan
Browse files

powerpc/io: Rename _insw_ns() etc. 



The "_ns" suffix was "historical" in 2006, finally remove it.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20241218105523.416573-17-mpe@ellerman.id.au
parent 0305292f

arch/powerpc/include/asm/io.h

+5 −18
Original line number Diff line number Diff line
@@ -80,16 +80,12 @@ extern bool isa_io_special; 
 *

 *	in_8, in_le16, in_be16, in_le32, in_be32, in_le64, in_be64

 *	out_8, out_le16, out_be16, out_le32, out_be32, out_le64, out_be64

 *	_insb, _insw_ns, _insl_ns, _outsb, _outsw_ns, _outsl_ns

 *	_insb, _insw, _insl, _outsb, _outsw, _outsl

 *

 * Those operate directly on a kernel virtual address. Note that the prototype

 * for the out_* accessors has the arguments in opposite order from the usual

 * linux PCI accessors. Unlike those, they take the address first and the value

 * next.

 *

 * Note: I might drop the _ns suffix on the stream operations soon as it is

 * simply normal for stream operations to not swap in the first place.

 *

 */



/* -mprefixed can generate offsets beyond range, fall back hack */
@@ -228,19 +224,10 @@ static inline void out_be64(volatile u64 __iomem *addr, u64 val) 
 */

extern void _insb(const volatile u8 __iomem *addr, void *buf, long count);

extern void _outsb(volatile u8 __iomem *addr,const void *buf,long count);

extern void _insw_ns(const volatile u16 __iomem *addr, void *buf, long count);

extern void _outsw_ns(volatile u16 __iomem *addr, const void *buf, long count);

extern void _insl_ns(const volatile u32 __iomem *addr, void *buf, long count);

extern void _outsl_ns(volatile u32 __iomem *addr, const void *buf, long count);



/* The _ns naming is historical and will be removed. For now, just #define

 * the non _ns equivalent names

 */

#define _insw	_insw_ns

#define _insl	_insl_ns

#define _outsw	_outsw_ns

#define _outsl	_outsl_ns



extern void _insw(const volatile u16 __iomem *addr, void *buf, long count);

extern void _outsw(volatile u16 __iomem *addr, const void *buf, long count);

extern void _insl(const volatile u32 __iomem *addr, void *buf, long count);

extern void _outsl(volatile u32 __iomem *addr, const void *buf, long count);



/*

 * memset_io, memcpy_toio, memcpy_fromio base implementations are out of line

arch/powerpc/kernel/io.c

+8 −8
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void _outsb(volatile u8 __iomem *port, const void *buf, long count) 
}

EXPORT_SYMBOL(_outsb);



void _insw_ns(const volatile u16 __iomem *port, void *buf, long count)

void _insw(const volatile u16 __iomem *port, void *buf, long count)

{

	u16 *tbuf = buf;

	u16 tmp;
@@ -70,9 +70,9 @@ void _insw_ns(const volatile u16 __iomem *port, void *buf, long count) 
	} while (--count != 0);

	asm volatile("twi 0,%0,0; isync" : : "r" (tmp));

}

EXPORT_SYMBOL(_insw_ns);

EXPORT_SYMBOL(_insw);



void _outsw_ns(volatile u16 __iomem *port, const void *buf, long count)

void _outsw(volatile u16 __iomem *port, const void *buf, long count)

{

	const u16 *tbuf = buf;
@@ -84,9 +84,9 @@ void _outsw_ns(volatile u16 __iomem *port, const void *buf, long count) 
	} while (--count != 0);

	asm volatile("sync");

}

EXPORT_SYMBOL(_outsw_ns);

EXPORT_SYMBOL(_outsw);



void _insl_ns(const volatile u32 __iomem *port, void *buf, long count)

void _insl(const volatile u32 __iomem *port, void *buf, long count)

{

	u32 *tbuf = buf;

	u32 tmp;
@@ -101,9 +101,9 @@ void _insl_ns(const volatile u32 __iomem *port, void *buf, long count) 
	} while (--count != 0);

	asm volatile("twi 0,%0,0; isync" : : "r" (tmp));

}

EXPORT_SYMBOL(_insl_ns);

EXPORT_SYMBOL(_insl);



void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count)

void _outsl(volatile u32 __iomem *port, const void *buf, long count)

{

	const u32 *tbuf = buf;
@@ -115,7 +115,7 @@ void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count) 
	} while (--count != 0);

	asm volatile("sync");

}

EXPORT_SYMBOL(_outsl_ns);

EXPORT_SYMBOL(_outsl);



#define IO_CHECK_ALIGN(v,a) ((((unsigned long)(v)) & ((a) - 1)) == 0)