Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
ide: <asm-sparc/ide_64.h>: use __raw_{read,write}w()
Use __raw_{read,write}w() in __ide_{in,out}sw()
and remove no longer needed {in,out}w_be().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by Bartlomiej Zolnierkiewicz and committed by David S. Miller edc83d4f 8fbf3f30
+8
-26
include/asm-sparc/ide_64.h
+8
-26
include/asm-sparc/ide_64.h
···
35
35
#define __ide_mm_outsw __ide_outsw
36
36
#define __ide_mm_outsl __ide_outsl
37
37
38
-
static inline unsigned int inw_be(void __iomem *addr)
39
-
{
40
-
unsigned int ret;
41
-
42
-
__asm__ __volatile__("lduha [%1] %2, %0"
43
-
: "=r" (ret)
44
-
: "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
45
-
46
-
return ret;
47
-
}
48
-
49
38
static inline void __ide_insw(void __iomem *port, void *dst, u32 count)
50
39
{
51
40
#ifdef DCACHE_ALIASING_POSSIBLE
···
44
55
u32 *pi;
45
56
46
57
if(((u64)ps) & 0x2) {
47
-
*ps++ = inw_be(port);
58
+
*ps++ = __raw_readw(port);
48
59
count--;
49
60
}
50
61
pi = (u32 *)ps;
51
62
while(count >= 2) {
52
63
u32 w;
53
64
54
-
w = inw_be(port) << 16;
55
-
w |= inw_be(port);
65
+
w = __raw_readw(port) << 16;
66
+
w |= __raw_readw(port);
56
67
*pi++ = w;
57
68
count -= 2;
58
69
}
59
70
ps = (u16 *)pi;
60
71
if(count)
61
-
*ps++ = inw_be(port);
72
+
*ps++ = __raw_readw(port);
62
73
63
74
#ifdef DCACHE_ALIASING_POSSIBLE
64
75
__flush_dcache_range((unsigned long)dst, end);
65
76
#endif
66
-
}
67
-
68
-
static inline void outw_be(unsigned short w, void __iomem *addr)
69
-
{
70
-
__asm__ __volatile__("stha %r0, [%1] %2"
71
-
: /* no outputs */
72
-
: "Jr" (w), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
73
77
}
74
78
75
79
static inline void __ide_outsw(void __iomem *port, void *src, u32 count)
···
74
92
const u32 *pi;
75
93
76
94
if(((u64)src) & 0x2) {
77
-
outw_be(*ps++, port);
95
+
__raw_writew(*ps++, port);
78
96
count--;
79
97
}
80
98
pi = (const u32 *)ps;
···
82
100
u32 w;
83
101
84
102
w = *pi++;
85
-
outw_be((w >> 16), port);
86
-
outw_be(w, port);
103
+
__raw_writew((w >> 16), port);
104
+
__raw_writew(w, port);
87
105
count -= 2;
88
106
}
89
107
ps = (const u16 *)pi;
90
108
if(count)
91
-
outw_be(*ps, port);
109
+
__raw_writew(*ps, port);
92
110
93
111
#ifdef DCACHE_ALIASING_POSSIBLE
94
112
__flush_dcache_range((unsigned long)src, end);