diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 17:50:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-09 17:50:09 -0800 |
| commit | 80f33a5fdf66d4338789e8aa80589bda088cb35d (patch) | |
| tree | a33c7626dc8555da46b9fef94bbc568336baa10d /arch/x86/boot | |
| parent | 7453311d68f16a5c587c3cbf19563c9a4fbbd41a (diff) | |
| parent | d505ad1d66c9cd31db5ab0d2c7bcb2a47e5bb29e (diff) | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Misc cleanups"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/rtc: Remove duplicate const specifier
x86, early_serial_console: Remove unnecessary check
x86, early_serial_console: Remove unused macro XMTRDY
x86, setup: Rename BOOT_ISDIGIT_H to BOOT_CTYPE_H
x86, CPU: Fix trivial printk formatting issues with dmesg
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/ctype.h | 5 | ||||
| -rw-r--r-- | arch/x86/boot/early_serial_console.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86/boot/ctype.h b/arch/x86/boot/ctype.h index 25e13403193c..020f137df7a2 100644 --- a/arch/x86/boot/ctype.h +++ b/arch/x86/boot/ctype.h @@ -1,6 +1,5 @@ -#ifndef BOOT_ISDIGIT_H - -#define BOOT_ISDIGIT_H +#ifndef BOOT_CTYPE_H +#define BOOT_CTYPE_H static inline int isdigit(int ch) { diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c index 5df2869c874b..45a07684bbab 100644 --- a/arch/x86/boot/early_serial_console.c +++ b/arch/x86/boot/early_serial_console.c @@ -2,8 +2,6 @@ #define DEFAULT_SERIAL_PORT 0x3f8 /* ttyS0 */ -#define XMTRDY 0x20 - #define DLAB 0x80 #define TXR 0 /* Transmit register (WRITE) */ @@ -74,8 +72,8 @@ static void parse_earlyprintk(void) static const int bases[] = { 0x3f8, 0x2f8 }; int idx = 0; - if (!strncmp(arg + pos, "ttyS", 4)) - pos += 4; + /* += strlen("ttyS"); */ + pos += 4; if (arg[pos++] == '1') idx = 1; |