* [PATCH 1/2] x86/io_delay: break instead of fallthrough in switch statement
@ 2019-05-21 7:22 Masahiro Yamada
2019-05-21 7:22 ` [PATCH 2/2] x86/io_delay: define IO_DELAY macros in C instead of Kconfig Masahiro Yamada
2019-05-24 8:04 ` [tip:x86/cleanups] x86/io_delay: Break instead of fallthrough in switch statement tip-bot for Masahiro Yamada
0 siblings, 2 replies; 4+ messages in thread
From: Masahiro Yamada @ 2019-05-21 7:22 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, Borislav Petkov, Peter Zijlstra, x86
Cc: H . Peter Anvin, Masahiro Yamada, linux-kernel
The current code is fine since 'case CONFIG_IO_DELAY_TYPE_NONE'
does nothing, but scripts/checkpatch.pl complains about this:
warning: Possible switch case/default not preceded by break or fallthrough comment
I like break statement better than a fallthrough comment here.
It avoids the warning and clarify the code.
No behavior change is intended.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/x86/kernel/io_delay.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index 805b7a341aca..3dc874d5d43b 100644
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -39,6 +39,7 @@ void native_io_delay(void)
* are shorter until calibrated):
*/
udelay(2);
+ break;
case CONFIG_IO_DELAY_TYPE_NONE:
break;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] x86/io_delay: define IO_DELAY macros in C instead of Kconfig
2019-05-21 7:22 [PATCH 1/2] x86/io_delay: break instead of fallthrough in switch statement Masahiro Yamada
@ 2019-05-21 7:22 ` Masahiro Yamada
2019-05-24 8:04 ` [tip:x86/cleanups] x86/io_delay: Define " tip-bot for Masahiro Yamada
2019-05-24 8:04 ` [tip:x86/cleanups] x86/io_delay: Break instead of fallthrough in switch statement tip-bot for Masahiro Yamada
1 sibling, 1 reply; 4+ messages in thread
From: Masahiro Yamada @ 2019-05-21 7:22 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, Borislav Petkov, Peter Zijlstra, x86
Cc: H . Peter Anvin, Masahiro Yamada, linux-kernel
CONFIG_IO_DELAY_TYPE_* are not kernel configuration at all. They just
define constant values, 0, 1, 2, and 3. Define them by #define in C.
CONFIG_DEFAULT_IO_DELAY_TYPE can also be defined in C by using #ifdef
and #define directives.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/x86/Kconfig.debug | 44 --------------------------------------
arch/x86/kernel/io_delay.c | 37 ++++++++++++++++++++++----------
2 files changed, 26 insertions(+), 55 deletions(-)
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index f730680dc818..6791a3c97589 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -179,26 +179,6 @@ config X86_DECODER_SELFTEST
decoder code.
If unsure, say "N".
-#
-# IO delay types:
-#
-
-config IO_DELAY_TYPE_0X80
- int
- default "0"
-
-config IO_DELAY_TYPE_0XED
- int
- default "1"
-
-config IO_DELAY_TYPE_UDELAY
- int
- default "2"
-
-config IO_DELAY_TYPE_NONE
- int
- default "3"
-
choice
prompt "IO delay type"
default IO_DELAY_0X80
@@ -229,30 +209,6 @@ config IO_DELAY_NONE
endchoice
-if IO_DELAY_0X80
-config DEFAULT_IO_DELAY_TYPE
- int
- default IO_DELAY_TYPE_0X80
-endif
-
-if IO_DELAY_0XED
-config DEFAULT_IO_DELAY_TYPE
- int
- default IO_DELAY_TYPE_0XED
-endif
-
-if IO_DELAY_UDELAY
-config DEFAULT_IO_DELAY_TYPE
- int
- default IO_DELAY_TYPE_UDELAY
-endif
-
-if IO_DELAY_NONE
-config DEFAULT_IO_DELAY_TYPE
- int
- default IO_DELAY_TYPE_NONE
-endif
-
config DEBUG_BOOT_PARAMS
bool "Debug boot parameters"
depends on DEBUG_KERNEL
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index 3dc874d5d43b..fdb6506ceaaa 100644
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -13,7 +13,22 @@
#include <linux/dmi.h>
#include <linux/io.h>
-int io_delay_type __read_mostly = CONFIG_DEFAULT_IO_DELAY_TYPE;
+#define IO_DELAY_TYPE_0X80 0
+#define IO_DELAY_TYPE_0XED 1
+#define IO_DELAY_TYPE_UDELAY 2
+#define IO_DELAY_TYPE_NONE 3
+
+#if defined(CONFIG_IO_DELAY_0X80)
+#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_0X80
+#elif defined(CONFIG_IO_DELAY_0XED)
+#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_0XED
+#elif defined(CONFIG_IO_DELAY_UDELAY)
+#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_UDELAY
+#elif defined(CONFIG_IO_DELAY_NONE)
+#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_NONE
+#endif
+
+int io_delay_type __read_mostly = DEFAULT_IO_DELAY_TYPE;
static int __initdata io_delay_override;
@@ -24,13 +39,13 @@ void native_io_delay(void)
{
switch (io_delay_type) {
default:
- case CONFIG_IO_DELAY_TYPE_0X80:
+ case IO_DELAY_TYPE_0X80:
asm volatile ("outb %al, $0x80");
break;
- case CONFIG_IO_DELAY_TYPE_0XED:
+ case IO_DELAY_TYPE_0XED:
asm volatile ("outb %al, $0xed");
break;
- case CONFIG_IO_DELAY_TYPE_UDELAY:
+ case IO_DELAY_TYPE_UDELAY:
/*
* 2 usecs is an upper-bound for the outb delay but
* note that udelay doesn't have the bus-level
@@ -40,7 +55,7 @@ void native_io_delay(void)
*/
udelay(2);
break;
- case CONFIG_IO_DELAY_TYPE_NONE:
+ case IO_DELAY_TYPE_NONE:
break;
}
}
@@ -48,9 +63,9 @@ EXPORT_SYMBOL(native_io_delay);
static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
{
- if (io_delay_type == CONFIG_IO_DELAY_TYPE_0X80) {
+ if (io_delay_type == IO_DELAY_TYPE_0X80) {
pr_notice("%s: using 0xed I/O delay port\n", id->ident);
- io_delay_type = CONFIG_IO_DELAY_TYPE_0XED;
+ io_delay_type = IO_DELAY_TYPE_0XED;
}
return 0;
@@ -116,13 +131,13 @@ static int __init io_delay_param(char *s)
return -EINVAL;
if (!strcmp(s, "0x80"))
- io_delay_type = CONFIG_IO_DELAY_TYPE_0X80;
+ io_delay_type = IO_DELAY_TYPE_0X80;
else if (!strcmp(s, "0xed"))
- io_delay_type = CONFIG_IO_DELAY_TYPE_0XED;
+ io_delay_type = IO_DELAY_TYPE_0XED;
else if (!strcmp(s, "udelay"))
- io_delay_type = CONFIG_IO_DELAY_TYPE_UDELAY;
+ io_delay_type = IO_DELAY_TYPE_UDELAY;
else if (!strcmp(s, "none"))
- io_delay_type = CONFIG_IO_DELAY_TYPE_NONE;
+ io_delay_type = IO_DELAY_TYPE_NONE;
else
return -EINVAL;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:x86/cleanups] x86/io_delay: Break instead of fallthrough in switch statement
2019-05-21 7:22 [PATCH 1/2] x86/io_delay: break instead of fallthrough in switch statement Masahiro Yamada
2019-05-21 7:22 ` [PATCH 2/2] x86/io_delay: define IO_DELAY macros in C instead of Kconfig Masahiro Yamada
@ 2019-05-24 8:04 ` tip-bot for Masahiro Yamada
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Masahiro Yamada @ 2019-05-24 8:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: torvalds, peterz, hpa, mingo, bp, linux-kernel, yamada.masahiro, tglx
Commit-ID: e62a4239c3dfd182a7e676cfe9efb1f4cec5ca25
Gitweb: https://git.kernel.org/tip/e62a4239c3dfd182a7e676cfe9efb1f4cec5ca25
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
AuthorDate: Tue, 21 May 2019 16:22:10 +0900
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 24 May 2019 08:46:06 +0200
x86/io_delay: Break instead of fallthrough in switch statement
The current code is fine since 'case CONFIG_IO_DELAY_TYPE_NONE'
does nothing, but scripts/checkpatch.pl complains about this:
warning: Possible switch case/default not preceded by break or fallthrough comment
I like break statement better than a fallthrough comment here.
It avoids the warning and clarify the code.
No behavior change is intended.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20190521072211.21014-1-yamada.masahiro@socionext.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/io_delay.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index 805b7a341aca..3dc874d5d43b 100644
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -39,6 +39,7 @@ void native_io_delay(void)
* are shorter until calibrated):
*/
udelay(2);
+ break;
case CONFIG_IO_DELAY_TYPE_NONE:
break;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip:x86/cleanups] x86/io_delay: Define IO_DELAY macros in C instead of Kconfig
2019-05-21 7:22 ` [PATCH 2/2] x86/io_delay: define IO_DELAY macros in C instead of Kconfig Masahiro Yamada
@ 2019-05-24 8:04 ` tip-bot for Masahiro Yamada
0 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Masahiro Yamada @ 2019-05-24 8:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: mingo, peterz, bp, tglx, yamada.masahiro, linux-kernel, hpa, torvalds
Commit-ID: c2d64c7ec4de6385150aa79570c438b4ba49c243
Gitweb: https://git.kernel.org/tip/c2d64c7ec4de6385150aa79570c438b4ba49c243
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
AuthorDate: Tue, 21 May 2019 16:22:11 +0900
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 24 May 2019 08:46:06 +0200
x86/io_delay: Define IO_DELAY macros in C instead of Kconfig
CONFIG_IO_DELAY_TYPE_* are not kernel configuration at all. They just
define constant values, 0, 1, 2, and 3. Define them by #define in C.
CONFIG_DEFAULT_IO_DELAY_TYPE can also be defined in C by using #ifdef
and #define directives.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20190521072211.21014-2-yamada.masahiro@socionext.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/Kconfig.debug | 44 --------------------------------------------
arch/x86/kernel/io_delay.c | 37 ++++++++++++++++++++++++++-----------
2 files changed, 26 insertions(+), 55 deletions(-)
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index f730680dc818..6791a3c97589 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -179,26 +179,6 @@ config X86_DECODER_SELFTEST
decoder code.
If unsure, say "N".
-#
-# IO delay types:
-#
-
-config IO_DELAY_TYPE_0X80
- int
- default "0"
-
-config IO_DELAY_TYPE_0XED
- int
- default "1"
-
-config IO_DELAY_TYPE_UDELAY
- int
- default "2"
-
-config IO_DELAY_TYPE_NONE
- int
- default "3"
-
choice
prompt "IO delay type"
default IO_DELAY_0X80
@@ -229,30 +209,6 @@ config IO_DELAY_NONE
endchoice
-if IO_DELAY_0X80
-config DEFAULT_IO_DELAY_TYPE
- int
- default IO_DELAY_TYPE_0X80
-endif
-
-if IO_DELAY_0XED
-config DEFAULT_IO_DELAY_TYPE
- int
- default IO_DELAY_TYPE_0XED
-endif
-
-if IO_DELAY_UDELAY
-config DEFAULT_IO_DELAY_TYPE
- int
- default IO_DELAY_TYPE_UDELAY
-endif
-
-if IO_DELAY_NONE
-config DEFAULT_IO_DELAY_TYPE
- int
- default IO_DELAY_TYPE_NONE
-endif
-
config DEBUG_BOOT_PARAMS
bool "Debug boot parameters"
depends on DEBUG_KERNEL
diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
index 3dc874d5d43b..fdb6506ceaaa 100644
--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -13,7 +13,22 @@
#include <linux/dmi.h>
#include <linux/io.h>
-int io_delay_type __read_mostly = CONFIG_DEFAULT_IO_DELAY_TYPE;
+#define IO_DELAY_TYPE_0X80 0
+#define IO_DELAY_TYPE_0XED 1
+#define IO_DELAY_TYPE_UDELAY 2
+#define IO_DELAY_TYPE_NONE 3
+
+#if defined(CONFIG_IO_DELAY_0X80)
+#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_0X80
+#elif defined(CONFIG_IO_DELAY_0XED)
+#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_0XED
+#elif defined(CONFIG_IO_DELAY_UDELAY)
+#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_UDELAY
+#elif defined(CONFIG_IO_DELAY_NONE)
+#define DEFAULT_IO_DELAY_TYPE IO_DELAY_TYPE_NONE
+#endif
+
+int io_delay_type __read_mostly = DEFAULT_IO_DELAY_TYPE;
static int __initdata io_delay_override;
@@ -24,13 +39,13 @@ void native_io_delay(void)
{
switch (io_delay_type) {
default:
- case CONFIG_IO_DELAY_TYPE_0X80:
+ case IO_DELAY_TYPE_0X80:
asm volatile ("outb %al, $0x80");
break;
- case CONFIG_IO_DELAY_TYPE_0XED:
+ case IO_DELAY_TYPE_0XED:
asm volatile ("outb %al, $0xed");
break;
- case CONFIG_IO_DELAY_TYPE_UDELAY:
+ case IO_DELAY_TYPE_UDELAY:
/*
* 2 usecs is an upper-bound for the outb delay but
* note that udelay doesn't have the bus-level
@@ -40,7 +55,7 @@ void native_io_delay(void)
*/
udelay(2);
break;
- case CONFIG_IO_DELAY_TYPE_NONE:
+ case IO_DELAY_TYPE_NONE:
break;
}
}
@@ -48,9 +63,9 @@ EXPORT_SYMBOL(native_io_delay);
static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
{
- if (io_delay_type == CONFIG_IO_DELAY_TYPE_0X80) {
+ if (io_delay_type == IO_DELAY_TYPE_0X80) {
pr_notice("%s: using 0xed I/O delay port\n", id->ident);
- io_delay_type = CONFIG_IO_DELAY_TYPE_0XED;
+ io_delay_type = IO_DELAY_TYPE_0XED;
}
return 0;
@@ -116,13 +131,13 @@ static int __init io_delay_param(char *s)
return -EINVAL;
if (!strcmp(s, "0x80"))
- io_delay_type = CONFIG_IO_DELAY_TYPE_0X80;
+ io_delay_type = IO_DELAY_TYPE_0X80;
else if (!strcmp(s, "0xed"))
- io_delay_type = CONFIG_IO_DELAY_TYPE_0XED;
+ io_delay_type = IO_DELAY_TYPE_0XED;
else if (!strcmp(s, "udelay"))
- io_delay_type = CONFIG_IO_DELAY_TYPE_UDELAY;
+ io_delay_type = IO_DELAY_TYPE_UDELAY;
else if (!strcmp(s, "none"))
- io_delay_type = CONFIG_IO_DELAY_TYPE_NONE;
+ io_delay_type = IO_DELAY_TYPE_NONE;
else
return -EINVAL;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-24 8:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-21 7:22 [PATCH 1/2] x86/io_delay: break instead of fallthrough in switch statement Masahiro Yamada
2019-05-21 7:22 ` [PATCH 2/2] x86/io_delay: define IO_DELAY macros in C instead of Kconfig Masahiro Yamada
2019-05-24 8:04 ` [tip:x86/cleanups] x86/io_delay: Define " tip-bot for Masahiro Yamada
2019-05-24 8:04 ` [tip:x86/cleanups] x86/io_delay: Break instead of fallthrough in switch statement tip-bot for Masahiro Yamada
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.