[PATCH -next 022/491] X86 MCE INFRASTRUCTURE: Use fallthrough;

[PATCH -next 022/491] X86 MCE INFRASTRUCTURE: Use fallthrough;

[Joe Perches]

Convert the various uses of fallthrough comments to fallthrough;

Done via script
Link: https://lore.kernel.org/lkml/b56602fcf79f849e733e7b521bb0e17895d390fa.1582230379.git.joe.com/

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/x86/kernel/cpu/mce/inject.c | 2 +-
 arch/x86/kernel/cpu/mce/intel.c  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c
index 3413b41..b5e3bab 100644
--- a/arch/x86/kernel/cpu/mce/inject.c
+++ b/arch/x86/kernel/cpu/mce/inject.c
@@ -199,7 +199,7 @@ static int raise_local(void)
 			 * calling irq_enter, but the necessary
 			 * machinery isn't exported currently.
 			 */
-			/*FALL THROUGH*/
+			fallthrough;
 		case MCJ_CTX_PROCESS:
 			raise_exception(m, NULL);
 			break;
diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
index d8f9230..5be647 100644
--- a/arch/x86/kernel/cpu/mce/intel.c
+++ b/arch/x86/kernel/cpu/mce/intel.c
@@ -192,9 +192,7 @@ unsigned long cmci_intel_adjust_timer(unsigned long interval)
 		__this_cpu_write(cmci_storm_state, CMCI_STORM_SUBSIDED);
 		if (!atomic_sub_return(1, &cmci_storm_on_cpus))
 			pr_notice("CMCI storm subsided: switching to interrupt mode\n");
-
-		/* FALLTHROUGH */
-
+		fallthrough;
 	case CMCI_STORM_SUBSIDED:
 		/*
 		 * We wait for all CPUs to go back to SUBSIDED state. When that
-- 
2.24.0

Re: [PATCH -next 022/491] X86 MCE INFRASTRUCTURE: Use fallthrough;

[Borislav Petkov]

On Tue, Mar 10, 2020 at 09:51:36PM -0700, Joe Perches wrote:

> Subject: Re: [PATCH -next 022/491] X86 MCE INFRASTRUCTURE: Use fallthrough;

Make that subject prefix "x86/mce: ..."

> Convert the various uses of fallthrough comments to fallthrough;
> 
> Done via script
> Link: https://lore.kernel.org/lkml/b56602fcf79f849e733e7b521bb0e17895d390fa.1582230379.git.joe.com/
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  arch/x86/kernel/cpu/mce/inject.c | 2 +-
>  arch/x86/kernel/cpu/mce/intel.c  | 4 +---
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c
> index 3413b41..b5e3bab 100644
> --- a/arch/x86/kernel/cpu/mce/inject.c
> +++ b/arch/x86/kernel/cpu/mce/inject.c
> @@ -199,7 +199,7 @@ static int raise_local(void)
>  			 * calling irq_enter, but the necessary
>  			 * machinery isn't exported currently.
>  			 */
> -			/*FALL THROUGH*/
> +			fallthrough;
>  		case MCJ_CTX_PROCESS:
>  			raise_exception(m, NULL);
>  			break;
> diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
> index d8f9230..5be647 100644
> --- a/arch/x86/kernel/cpu/mce/intel.c
> +++ b/arch/x86/kernel/cpu/mce/intel.c
> @@ -192,9 +192,7 @@ unsigned long cmci_intel_adjust_timer(unsigned long interval)
>  		__this_cpu_write(cmci_storm_state, CMCI_STORM_SUBSIDED);
>  		if (!atomic_sub_return(1, &cmci_storm_on_cpus))
>  			pr_notice("CMCI storm subsided: switching to interrupt mode\n");
> -
> -		/* FALLTHROUGH */
> -
> +		fallthrough;
>  	case CMCI_STORM_SUBSIDED:
>  		/*
>  		 * We wait for all CPUs to go back to SUBSIDED state. When that
> -- 

With that:

Acked-by: Borislav Petkov <bp@suse.de>

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette