diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-15 11:38:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-15 11:38:51 +0100 |
| commit | 2372673c64c02fd7663fc365964d1a18582469a0 (patch) | |
| tree | ad4fb22d49447f1e36963349d842e13351d296a9 /arch/x86/boot | |
| parent | Merge branch 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| parent | x86, early_serial_console: Remove unnecessary check (diff) | |
| download | linux-2372673c64c02fd7663fc365964d1a18582469a0.tar.xz linux-2372673c64c02fd7663fc365964d1a18582469a0.zip | |
Merge tag 'x86_queue' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/cleanups
Pull minor x86 cleanups from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; |