diff options
author | Helge Deller <deller@gmx.de> | 2017-06-08 16:09:18 -0400 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2017-06-09 05:34:54 -0400 |
commit | 3f4fb1084d9453c0b0fa2a7f51fe7e7d99b6722f (patch) | |
tree | faa66a4d5cfb5a9cc613efdae3f80771413e9c7c | |
parent | b752c7b20709e0ecee0f7d4ef6ef82fcc27408b6 (diff) |
parisc: Don't hardcode PSW values in gsc_*() functions
Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r-- | arch/parisc/include/asm/io.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h index 1a16f1d1075f..af98254f7257 100644 --- a/arch/parisc/include/asm/io.h +++ b/arch/parisc/include/asm/io.h | |||
@@ -34,10 +34,10 @@ static inline unsigned char gsc_readb(unsigned long addr) | |||
34 | unsigned char ret; | 34 | unsigned char ret; |
35 | 35 | ||
36 | __asm__ __volatile__( | 36 | __asm__ __volatile__( |
37 | " rsm 2,%0\n" | 37 | " rsm %3,%0\n" |
38 | " ldbx 0(%2),%1\n" | 38 | " ldbx 0(%2),%1\n" |
39 | " mtsm %0\n" | 39 | " mtsm %0\n" |
40 | : "=&r" (flags), "=r" (ret) : "r" (addr) ); | 40 | : "=&r" (flags), "=r" (ret) : "r" (addr), "i" (PSW_SM_D) ); |
41 | 41 | ||
42 | return ret; | 42 | return ret; |
43 | } | 43 | } |
@@ -48,10 +48,10 @@ static inline unsigned short gsc_readw(unsigned long addr) | |||
48 | unsigned short ret; | 48 | unsigned short ret; |
49 | 49 | ||
50 | __asm__ __volatile__( | 50 | __asm__ __volatile__( |
51 | " rsm 2,%0\n" | 51 | " rsm %3,%0\n" |
52 | " ldhx 0(%2),%1\n" | 52 | " ldhx 0(%2),%1\n" |
53 | " mtsm %0\n" | 53 | " mtsm %0\n" |
54 | : "=&r" (flags), "=r" (ret) : "r" (addr) ); | 54 | : "=&r" (flags), "=r" (ret) : "r" (addr), "i" (PSW_SM_D) ); |
55 | 55 | ||
56 | return ret; | 56 | return ret; |
57 | } | 57 | } |
@@ -87,20 +87,20 @@ static inline void gsc_writeb(unsigned char val, unsigned long addr) | |||
87 | { | 87 | { |
88 | long flags; | 88 | long flags; |
89 | __asm__ __volatile__( | 89 | __asm__ __volatile__( |
90 | " rsm 2,%0\n" | 90 | " rsm %3,%0\n" |
91 | " stbs %1,0(%2)\n" | 91 | " stbs %1,0(%2)\n" |
92 | " mtsm %0\n" | 92 | " mtsm %0\n" |
93 | : "=&r" (flags) : "r" (val), "r" (addr) ); | 93 | : "=&r" (flags) : "r" (val), "r" (addr), "i" (PSW_SM_D) ); |
94 | } | 94 | } |
95 | 95 | ||
96 | static inline void gsc_writew(unsigned short val, unsigned long addr) | 96 | static inline void gsc_writew(unsigned short val, unsigned long addr) |
97 | { | 97 | { |
98 | long flags; | 98 | long flags; |
99 | __asm__ __volatile__( | 99 | __asm__ __volatile__( |
100 | " rsm 2,%0\n" | 100 | " rsm %3,%0\n" |
101 | " sths %1,0(%2)\n" | 101 | " sths %1,0(%2)\n" |
102 | " mtsm %0\n" | 102 | " mtsm %0\n" |
103 | : "=&r" (flags) : "r" (val), "r" (addr) ); | 103 | : "=&r" (flags) : "r" (val), "r" (addr), "i" (PSW_SM_D) ); |
104 | } | 104 | } |
105 | 105 | ||
106 | static inline void gsc_writel(unsigned int val, unsigned long addr) | 106 | static inline void gsc_writel(unsigned int val, unsigned long addr) |