[Skiboot] [PATCH] GCC7: fixes for -Wimplicit-fallthrough expected regexes

Stewart Smith stewart at linux.vnet.ibm.com
Wed May 10 19:33:52 AEST 2017


It turns out GCC7 adds a useful warning and does fancy things like
parsing your comments to work out that you intended to do the fallthrough.
There's a few places where we don't match the regex. Fix them, as it's
harmless to do so.

Found by building on Fedora Rawhide in Travis.

Signed-off-by: Stewart Smith <stewart at linux.vnet.ibm.com>
---
 core/pcie-slot.c                | 3 ++-
 hw/fsp/fsp-sysparam.c           | 2 +-
 platforms/ibm-fsp/firenze-pci.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/pcie-slot.c b/core/pcie-slot.c
index 022668acb882..1b7e24cbfc67 100644
--- a/core/pcie-slot.c
+++ b/core/pcie-slot.c
@@ -427,7 +427,8 @@ static int64_t pcie_slot_sm_freset(struct pci_slot *slot)
 				PCI_SLOT_STATE_FRESET_POWER_OFF);
 			return pci_slot_set_sm_timeout(slot, msecs_to_tb(50));
 		}
-		/* No power state change, fall through */
+		/* No power state change, */
+		/* fallthrough */
 	case PCI_SLOT_STATE_FRESET_POWER_OFF:
 		PCIE_SLOT_DBG(slot, "FRESET: Power is off, turn on\n");
 		pcie_slot_set_power_state_ext(slot, PCI_SLOT_POWER_ON, false);
diff --git a/hw/fsp/fsp-sysparam.c b/hw/fsp/fsp-sysparam.c
index 2dbf05c6e438..5d7ae91e8c1a 100644
--- a/hw/fsp/fsp-sysparam.c
+++ b/hw/fsp/fsp-sysparam.c
@@ -100,7 +100,7 @@ static int fsp_sysparam_process(struct sysparam_req *r)
 	case 0x00: /* XXX Is that even possible ? */
 	case 0x11: /* Data in request */
 		memcpy(r->ubuf, &r->resp.data.words[2], len);
-		/* pass through */
+		/* fallthrough */
 	case 0x12: /* Data in TCE */
 		stlen = len;
 		break;
diff --git a/platforms/ibm-fsp/firenze-pci.c b/platforms/ibm-fsp/firenze-pci.c
index 1b8b5dc130d6..0a93387e5d13 100644
--- a/platforms/ibm-fsp/firenze-pci.c
+++ b/platforms/ibm-fsp/firenze-pci.c
@@ -505,7 +505,8 @@ static int64_t firenze_pci_slot_freset(struct pci_slot *slot)
 					msecs_to_tb(FIRENZE_PCI_SLOT_DELAY));
 		}
 
-		/* Fall through: Power is off, turn it on */
+		/* Power is off, turn it on */
+		/* Fallthrough */
 	case FIRENZE_PCI_SLOT_FRESET_POWER_OFF:
 		/* Update last power status */
 		pval = (uint8_t *)(plat_slot->req->rw_buf);
-- 
2.9.3



More information about the Skiboot mailing list