Skip to content

Commit 0f4d3aa

Browse files
Matthew WhiteheadKAGA-KOKO
authored andcommitted
x86/cpu/cyrix: Remove {get,set}Cx86_old macros used for Cyrix processors
The getCx86_old() and setCx86_old() macros have been replaced with correctly working getCx86() and setCx86(), so remove these unused macros. Signed-off-by: Matthew Whitehead <tedheadster@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: luto@kernel.org Link: https://lkml.kernel.org/r/1552596361-8967-3-git-send-email-tedheadster@gmail.com
1 parent 18fb053 commit 0f4d3aa

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

arch/x86/include/asm/processor-cyrix.h

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,6 @@
33
* NSC/Cyrix CPU indexed register access. Must be inlined instead of
44
* macros to ensure correct access ordering
55
* Access order is always 0x22 (=offset), 0x23 (=value)
6-
*
7-
* When using the old macros a line like
8-
* setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);
9-
* gets expanded to:
10-
* do {
11-
* outb((CX86_CCR2), 0x22);
12-
* outb((({
13-
* outb((CX86_CCR2), 0x22);
14-
* inb(0x23);
15-
* }) | 0x88), 0x23);
16-
* } while (0);
17-
*
18-
* which in fact violates the access order (= 0x22, 0x22, 0x23, 0x23).
196
*/
207

218
static inline u8 getCx86(u8 reg)
@@ -29,11 +16,3 @@ static inline void setCx86(u8 reg, u8 data)
2916
outb(reg, 0x22);
3017
outb(data, 0x23);
3118
}
32-
33-
#define getCx86_old(reg) ({ outb((reg), 0x22); inb(0x23); })
34-
35-
#define setCx86_old(reg, data) do { \
36-
outb((reg), 0x22); \
37-
outb((data), 0x23); \
38-
} while (0)
39-

0 commit comments

Comments
 (0)