linux-kernel - Re: [PATCH 1/2] PCI: annotate implicit fall throughs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 14 Jan 2019 17:00:42 -0600
From:   Bjorn Helgaas <helgaas@...nel.org>
To:     Mathieu Malaterre <malat@...ian.org>
Cc:     linux-pci@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/2] PCI: annotate implicit fall throughs

On Mon, Jan 14, 2019 at 09:41:36PM +0100, Mathieu Malaterre wrote:
> There is a plan to build the kernel with -Wimplicit-fallthrough and
> these places in the code produced warnings (W=1). Fix them up.
> 
> In this particular case change a ‘:’ with either a ‘-’ or a ‘,’
> so as to match the regular expression expected by GCC.
> 
> This commit remove the following warnings:
> 
>   drivers/pci/pci.c:861:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
>   drivers/pci/pci.c:2261:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
> 
> Signed-off-by: Mathieu Malaterre <malat@...ian.org>

I squashed these and applied the result to pci/misc for v5.1, thanks!

> ---
>  drivers/pci/pci.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index c9d8e3c837de..94069fc35e91 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -861,7 +861,7 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state)
>  		if ((pmcsr & PCI_PM_CTRL_STATE_MASK) == PCI_D3hot
>  		 && !(pmcsr & PCI_PM_CTRL_NO_SOFT_RESET))
>  			need_restore = true;
> -		/* Fall-through: force to D0 */
> +		/* Fall-through - force to D0 */
>  	default:
>  		pmcsr = 0;
>  		break;
> @@ -2260,7 +2260,7 @@ static pci_power_t pci_target_state(struct pci_dev *dev, bool wakeup)
>  		case PCI_D2:
>  			if (pci_no_d1d2(dev))
>  				break;
> -			/* else: fall through */
> +			/* else, fall through */
>  		default:
>  			target_state = state;
>  		}
> -- 
> 2.19.2
>