Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
powerpc/io: Rename _insw_ns() etc.
The "_ns" suffix was "historical" in 2006, finally remove it.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20241218105523.416573-17-mpe@ellerman.id.au
authored by
Michael Ellerman
and committed by
Madhavan Srinivasan
76c7d430
0305292f
+13
-26
+5
-18
arch/powerpc/include/asm/io.h
+5
-18
arch/powerpc/include/asm/io.h
···
80
80
*
81
81
* in_8, in_le16, in_be16, in_le32, in_be32, in_le64, in_be64
82
82
* out_8, out_le16, out_be16, out_le32, out_be32, out_le64, out_be64
83
-
* _insb, _insw_ns, _insl_ns, _outsb, _outsw_ns, _outsl_ns
83
+
* _insb, _insw, _insl, _outsb, _outsw, _outsl
84
84
*
85
85
* Those operate directly on a kernel virtual address. Note that the prototype
86
86
* for the out_* accessors has the arguments in opposite order from the usual
87
87
* linux PCI accessors. Unlike those, they take the address first and the value
88
88
* next.
89
-
*
90
-
* Note: I might drop the _ns suffix on the stream operations soon as it is
91
-
* simply normal for stream operations to not swap in the first place.
92
-
*
93
89
*/
94
90
95
91
/* -mprefixed can generate offsets beyond range, fall back hack */
···
224
228
*/
225
229
extern void _insb(const volatile u8 __iomem *addr, void *buf, long count);
226
230
extern void _outsb(volatile u8 __iomem *addr,const void *buf,long count);
227
-
extern void _insw_ns(const volatile u16 __iomem *addr, void *buf, long count);
228
-
extern void _outsw_ns(volatile u16 __iomem *addr, const void *buf, long count);
229
-
extern void _insl_ns(const volatile u32 __iomem *addr, void *buf, long count);
230
-
extern void _outsl_ns(volatile u32 __iomem *addr, const void *buf, long count);
231
-
232
-
/* The _ns naming is historical and will be removed. For now, just #define
233
-
* the non _ns equivalent names
234
-
*/
235
-
#define _insw _insw_ns
236
-
#define _insl _insl_ns
237
-
#define _outsw _outsw_ns
238
-
#define _outsl _outsl_ns
239
-
231
+
extern void _insw(const volatile u16 __iomem *addr, void *buf, long count);
232
+
extern void _outsw(volatile u16 __iomem *addr, const void *buf, long count);
233
+
extern void _insl(const volatile u32 __iomem *addr, void *buf, long count);
234
+
extern void _outsl(volatile u32 __iomem *addr, const void *buf, long count);
240
235
241
236
/*
242
237
* memset_io, memcpy_toio, memcpy_fromio base implementations are out of line
+8
-8
arch/powerpc/kernel/io.c
+8
-8
arch/powerpc/kernel/io.c
···
55
55
}
56
56
EXPORT_SYMBOL(_outsb);
57
57
58
-
void _insw_ns(const volatile u16 __iomem *port, void *buf, long count)
58
+
void _insw(const volatile u16 __iomem *port, void *buf, long count)
59
59
{
60
60
u16 *tbuf = buf;
61
61
u16 tmp;
···
70
70
} while (--count != 0);
71
71
asm volatile("twi 0,%0,0; isync" : : "r" (tmp));
72
72
}
73
-
EXPORT_SYMBOL(_insw_ns);
73
+
EXPORT_SYMBOL(_insw);
74
74
75
-
void _outsw_ns(volatile u16 __iomem *port, const void *buf, long count)
75
+
void _outsw(volatile u16 __iomem *port, const void *buf, long count)
76
76
{
77
77
const u16 *tbuf = buf;
78
78
···
84
84
} while (--count != 0);
85
85
asm volatile("sync");
86
86
}
87
-
EXPORT_SYMBOL(_outsw_ns);
87
+
EXPORT_SYMBOL(_outsw);
88
88
89
-
void _insl_ns(const volatile u32 __iomem *port, void *buf, long count)
89
+
void _insl(const volatile u32 __iomem *port, void *buf, long count)
90
90
{
91
91
u32 *tbuf = buf;
92
92
u32 tmp;
···
101
101
} while (--count != 0);
102
102
asm volatile("twi 0,%0,0; isync" : : "r" (tmp));
103
103
}
104
-
EXPORT_SYMBOL(_insl_ns);
104
+
EXPORT_SYMBOL(_insl);
105
105
106
-
void _outsl_ns(volatile u32 __iomem *port, const void *buf, long count)
106
+
void _outsl(volatile u32 __iomem *port, const void *buf, long count)
107
107
{
108
108
const u32 *tbuf = buf;
109
109
···
115
115
} while (--count != 0);
116
116
asm volatile("sync");
117
117
}
118
-
EXPORT_SYMBOL(_outsl_ns);
118
+
EXPORT_SYMBOL(_outsl);
119
119
120
120
#define IO_CHECK_ALIGN(v,a) ((((unsigned long)(v)) & ((a) - 1)) == 0)
121
121