Skip to contentSkip to conversation

vfio: Mark expected switch fall-throughs

PATCH Applied Gustavo A. R. Silva 2 participants 2 messages Jul 9, 2018 – Aug 7, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vfio: Mark expected switch fall-throughs

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

---
 drivers/vfio/pci/vfio_pci.c     | 2 +-
 drivers/vfio/vfio_iommu_type1.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/vfio/pci/vfio_pci.c +1 -1
index b423a30..5afc7f7 100644
@@ -785,7 +785,7 @@ static long vfio_pci_ioctl(void *device_data,
 		case VFIO_PCI_ERR_IRQ_INDEX:
 			if (pci_is_pcie(vdev->pdev))
 				break;
-		/* pass thru to return error */
+		/* fall through */
 		default:
 			return -EINVAL;
 		}
drivers/vfio/vfio_iommu_type1.c +1 -0
index 3e5b177..d9fd318 100644
@@ -1601,6 +1601,7 @@ static void *vfio_iommu_type1_open(unsigned long arg)
 		break;
 	case VFIO_TYPE1_NESTING_IOMMU:
 		iommu->nesting = true;
+		/* fall through */
 	case VFIO_TYPE1v2_IOMMU:
 		iommu->v2 = true;
 		break;
Signature · 1 line
2.7.4
#1 lore raw
Quoted 8 lines · On Mon, 9 Jul 2018 17:53:09 -0500 "Gustavo A. R. Silva"…

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

---
 drivers/vfio/pci/vfio_pci.c     | 2 +-
 drivers/vfio/vfio_iommu_type1.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Applied to vfio next branch for v4.19. Thanks,

Alex