PCI: Use fallthrough pseudo-keyword
PATCH 1/1 PCI: Use fallthrough pseudo-keyword
Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary fall-through markings when it is the case.
Signed-off-by Gustavo A. R. Silva <[email protected]>
--- drivers/pci/hotplug/ibmphp_res.c | 2 +- drivers/pci/hotplug/pciehp_ctrl.c | 4 ++-- drivers/pci/hotplug/shpchp_ctrl.c | 4 ++-- drivers/pci/pci.c | 4 ++-- drivers/pci/proc.c | 2 +- drivers/pci/quirks.c | 4 ++-- drivers/pci/setup-bus.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-)
drivers/pci/hotplug/ibmphp_res.c +1 -1
@@ -1941,7 +1941,7 @@ static int __init update_bridge_ranges(struct bus_node **bus)break ;case PCI_HEADER_TYPE_BRIDGE : function =0x8 ; -/* fall through */ + fallthrough;case PCI_HEADER_TYPE_MULTIBRIDGE :/* We assume here that only 1 bus behind the bridge TO DO: add functionality for several:
drivers/pci/hotplug/pciehp_ctrl.c +2 -2
@@ -236,7 +236,7 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events)switch (ctrl->state) {case BLINKINGOFF_STATE :cancel_delayed_work (&ctrl->button_work); -/* fall through */ + fallthrough;case ON_STATE : ctrl->state =POWEROFF_STATE ;mutex_unlock (&ctrl->state_lock);
@@ -265,7 +265,7 @@ void pciehp_handle_presence_or_link_change(struct controller *ctrl, u32 events)switch (ctrl->state) {case BLINKINGON_STATE :cancel_delayed_work (&ctrl->button_work); -/* fall through */ + fallthrough;case OFF_STATE : ctrl->state =POWERON_STATE ;mutex_unlock (&ctrl->state_lock);
drivers/pci/hotplug/shpchp_ctrl.c +2 -2
@@ -642,7 +642,7 @@ int shpchp_sysfs_enable_slot(struct slot *p_slot)switch (p_slot->state) {case BLINKINGON_STATE :cancel_delayed_work (&p_slot->work); -/* fall through */ + fallthrough;case STATIC_STATE : p_slot->state =POWERON_STATE ;mutex_unlock (&p_slot->lock);
@@ -678,7 +678,7 @@ int shpchp_sysfs_disable_slot(struct slot *p_slot)switch (p_slot->state) {case BLINKINGOFF_STATE :cancel_delayed_work (&p_slot->work); -/* fall through */ + fallthrough;case STATIC_STATE : p_slot->state =POWEROFF_STATE ;mutex_unlock (&p_slot->lock);
drivers/pci/pci.c +2 -2
@@ -922,7 +922,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 */ + fallthrough;/* force to D0 */ default : pmcsr =0 ;break ;
@@ -2406,7 +2406,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 */ + fallthrough;default : target_state = state; }
drivers/pci/proc.c +1 -1
@@ -231,7 +231,7 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd, }/* If arch decided it can't, fall through... */ #endif /* HAVE_PCI_MMAP */ -/* fall through */ + fallthrough;default : ret = -EINVAL ;break ;
drivers/pci/quirks.c +2 -2
@@ -1730,7 +1730,7 @@ static void quirk_jmicron_ata(struct pci_dev *pdev)case PCI_DEVICE_ID_JMICRON_JMB366 :/* Redirect IDE second PATA port to the right spot */ conf5 |= (1 <<24 ); -/* Fall through */ + fallthrough;case PCI_DEVICE_ID_JMICRON_JMB361 :case PCI_DEVICE_ID_JMICRON_JMB363 :case PCI_DEVICE_ID_JMICRON_JMB369 :
@@ -2224,7 +2224,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 */ + fallthrough;case PCI_DEVICE_ID_NETMOS_9735 :case PCI_DEVICE_ID_NETMOS_9745 :case PCI_DEVICE_ID_NETMOS_9845 :
drivers/pci/setup-bus.c +1 -1
@@ -1252,7 +1252,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head) additional_mmio_size = pci_hotplug_mmio_size; additional_mmio_pref_size = pci_hotplug_mmio_pref_size; } -/* Fall through */ + fallthrough;default :pbus_size_io (bus, realloc_head ?0 : additional_io_size, additional_io_size, realloc_head);
Signature · 1 line
2.27.0