* [PATCH 1/2] PCI: annotate implicit fall throughs
@ 2019-01-14 20:41 Mathieu Malaterre
2019-01-14 20:41 ` [PATCH 2/2] PCI: annotate implicit fall through Mathieu Malaterre
2019-01-14 23:00 ` [PATCH 1/2] PCI: annotate implicit fall throughs Bjorn Helgaas
0 siblings, 2 replies; 3+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:41 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Mathieu Malaterre, linux-pci, linux-kernel
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@debian.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] PCI: annotate implicit fall through
2019-01-14 20:41 [PATCH 1/2] PCI: annotate implicit fall throughs Mathieu Malaterre
@ 2019-01-14 20:41 ` Mathieu Malaterre
2019-01-14 23:00 ` [PATCH 1/2] PCI: annotate implicit fall throughs Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Mathieu Malaterre @ 2019-01-14 20:41 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Mathieu Malaterre, linux-pci, linux-kernel
There is a plan to build the kernel with -Wimplicit-fallthrough and
this place in the code produced a warning (W=1).
In this particular case change a ‘:’ with a ‘,’ so as to match the
regular expression expected by GCC.
This commit remove the following warning:
drivers/pci/quirks.c:2138:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
drivers/pci/quirks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index b0a413f3f7ca..9fabcef345ed 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2138,7 +2138,7 @@ static void quirk_netmos(struct pci_dev *dev)
if (dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&
dev->subsystem_device == 0x0299)
return;
- /* else: fall through */
+ /* else, fall through */
case PCI_DEVICE_ID_NETMOS_9735:
case PCI_DEVICE_ID_NETMOS_9745:
case PCI_DEVICE_ID_NETMOS_9845:
--
2.19.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] PCI: annotate implicit fall throughs
2019-01-14 20:41 [PATCH 1/2] PCI: annotate implicit fall throughs Mathieu Malaterre
2019-01-14 20:41 ` [PATCH 2/2] PCI: annotate implicit fall through Mathieu Malaterre
@ 2019-01-14 23:00 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2019-01-14 23:00 UTC (permalink / raw)
To: Mathieu Malaterre; +Cc: linux-pci, linux-kernel
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@debian.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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-14 23:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-14 20:41 [PATCH 1/2] PCI: annotate implicit fall throughs Mathieu Malaterre
2019-01-14 20:41 ` [PATCH 2/2] PCI: annotate implicit fall through Mathieu Malaterre
2019-01-14 23:00 ` [PATCH 1/2] PCI: annotate implicit fall throughs Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).