Skip to content

Commit

Permalink
x86/cpu/cyrix: Remove {get,set}Cx86_old macros used for Cyrix processors
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Matthew Whitehead authored and Thomas Gleixner committed Mar 21, 2019
1 parent 18fb053 commit 0f4d3aa
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions arch/x86/include/asm/processor-cyrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,6 @@
* NSC/Cyrix CPU indexed register access. Must be inlined instead of
* macros to ensure correct access ordering
* Access order is always 0x22 (=offset), 0x23 (=value)
*
* When using the old macros a line like
* setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88);
* gets expanded to:
* do {
* outb((CX86_CCR2), 0x22);
* outb((({
* outb((CX86_CCR2), 0x22);
* inb(0x23);
* }) | 0x88), 0x23);
* } while (0);
*
* which in fact violates the access order (= 0x22, 0x22, 0x23, 0x23).
*/

static inline u8 getCx86(u8 reg)
Expand All @@ -29,11 +16,3 @@ static inline void setCx86(u8 reg, u8 data)
outb(reg, 0x22);
outb(data, 0x23);
}

#define getCx86_old(reg) ({ outb((reg), 0x22); inb(0x23); })

#define setCx86_old(reg, data) do { \
outb((reg), 0x22); \
outb((data), 0x23); \
} while (0)

0 comments on commit 0f4d3aa

Please sign in to comment.