From: Matthew Whitehead <tedheadster@gmail.com>
To: linux-kernel@vger.kernel.org, tglx@linutronix.de,
mingo@kernel.org, luto@kernel.org
Cc: Matthew Whitehead <tedheadster@gmail.com>
Subject: [PATCH 2/2] x86/CPU: Remove {get,set}Cx86_old macros used for Cyrix processors
Date: Wed, 6 Mar 2019 15:49:27 -0500 [thread overview]
Message-ID: <1551905367-26931-3-git-send-email-tedheadster@gmail.com> (raw)
In-Reply-To: <1551905367-26931-1-git-send-email-tedheadster@gmail.com>
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>
---
arch/x86/include/asm/processor-cyrix.h | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/arch/x86/include/asm/processor-cyrix.h b/arch/x86/include/asm/processor-cyrix.h
index aaedd73..df700a6 100644
--- a/arch/x86/include/asm/processor-cyrix.h
+++ b/arch/x86/include/asm/processor-cyrix.h
@@ -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)
@@ -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)
-
--
1.8.3.1
next prev parent reply other threads:[~2019-03-06 20:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-06 20:49 [PATCH 0/2] x86/CPU: Use correct Cyrix-specific macros Matthew Whitehead
2019-03-06 20:49 ` [PATCH 1/2] x86/CPU: Use correct macros for Cyrix calls on Geode processors Matthew Whitehead
2019-03-06 20:49 ` Matthew Whitehead [this message]
2019-03-14 20:45 [PATCH 0/2] x86/CPU: Use correct Cyrix-specific macros Matthew Whitehead
2019-03-14 20:46 ` [PATCH 2/2] x86/CPU: Remove {get,set}Cx86_old macros used for Cyrix processors Matthew Whitehead
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1551905367-26931-3-git-send-email-tedheadster@gmail.com \
--to=tedheadster@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).