ACPI: Use fallthrough pseudo-keyword
PATCH 1/1 ACPI: 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/acpi/ac.c | 2 +- drivers/acpi/acpi_processor.c | 2 +- drivers/acpi/button.c | 2 +- drivers/acpi/dock.c | 2 +- drivers/acpi/evged.c | 2 +- drivers/acpi/processor_idle.c | 3 +-- drivers/acpi/resource.c | 2 +- drivers/acpi/spcr.c | 4 ++-- drivers/pci/pci-acpi.c | 6 +++--- 9 files changed, 12 insertions(+), 13 deletions(-)
drivers/acpi/ac.c +1 -1
@@ -236,7 +236,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)default :ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"Unsupported event [0x%x]\n" , event)); -/* fall through */ + fallthrough;case ACPI_AC_NOTIFY_STATUS :case ACPI_NOTIFY_BUS_CHECK :case ACPI_NOTIFY_DEVICE_CHECK :
drivers/acpi/acpi_processor.c +1 -1
@@ -79,7 +79,7 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)* PIIX4 models. */ errata.piix4.throttle =1 ; -/* fall through*/ + fallthrough;case 2 :/* PIIX4E */ case 3 :/* PIIX4M */
drivers/acpi/button.c +1 -1
@@ -405,7 +405,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)switch (event) {case ACPI_FIXED_HARDWARE_EVENT : event =ACPI_BUTTON_NOTIFY_STATUS ; -/* fall through */ + fallthrough;case ACPI_BUTTON_NOTIFY_STATUS : input = button->input;if (button->type ==ACPI_BUTTON_TYPE_LID ) {
drivers/acpi/dock.c +1 -1
@@ -469,7 +469,7 @@ int dock_notify(struct acpi_device *adev, u32 event) surprise_removal =1 ; event =ACPI_NOTIFY_EJECT_REQUEST ;/* Fall back */ -/* fall through */ + fallthrough;case ACPI_NOTIFY_EJECT_REQUEST :begin_undock (ds); if ((immediate_undock && !(ds->flags & DOCK_IS_ATA))
drivers/acpi/evged.c +1 -1
@@ -106,7 +106,7 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares,if (ACPI_SUCCESS (acpi_get_handle (handle, ev_name, &evt_handle)))break ; -/* fall through */ + fallthrough;default :if (ACPI_SUCCESS (acpi_get_handle (handle,"_EVT" , &evt_handle)))break ;
drivers/acpi/processor_idle.c +1 -2
@@ -203,8 +203,7 @@ static void tsc_check_state(int state)*/ if (boot_cpu_has (X86_FEATURE_NONSTOP_TSC ))return ; - -/*FALL THROUGH*/ + fallthrough;default :/* TSC could halt in idle, so notify users */ if (state >ACPI_STATE_C1 )
drivers/acpi/resource.c +1 -1
@@ -373,7 +373,7 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity)case ACPI_ACTIVE_BOTH :if (triggering ==ACPI_EDGE_SENSITIVE )return IRQ_TYPE_EDGE_BOTH ; -/* fall through */ + fallthrough;default :return IRQ_TYPE_NONE ; }
drivers/acpi/spcr.c +2 -2
@@ -111,7 +111,7 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console) table->serial_port.access_width))) {default :pr_err ("Unexpected SPCR Access Width. Defaulting to byte size\n" ); -/* fall through */ + fallthrough;case 8 : iotype ="mmio" ;break ;
@@ -128,7 +128,7 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)switch (table->interface_type) {case ACPI_DBG2_ARM_SBSA_32BIT : iotype ="mmio32" ; -/* fall through */ + fallthrough;case ACPI_DBG2_ARM_PL011 :case ACPI_DBG2_ARM_SBSA_GENERIC :case ACPI_DBG2_BCM2835 :
drivers/pci/pci-acpi.c +3 -3
@@ -527,8 +527,8 @@ static void program_hpx_type3_register(struct pci_dev *dev,return ;break ; -case HPX_CFG_VEND_CAP :/* Fall through */ -case HPX_CFG_DVSEC :/* Fall through */ +case HPX_CFG_VEND_CAP : +case HPX_CFG_DVSEC :default :pci_warn (dev,"Encountered _HPX type 3 with unsupported config space location" );return ;
@@ -1001,7 +1001,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) error = -EBUSY ;break ; } -/* Fall through */ + fallthrough;case PCI_D0 :case PCI_D1 :case PCI_D2 :
Quoted 8 lines · Gustavo A. R. Silva
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]>
Applied as 5.9 material, thanks!
Quoted 151 lines
--- drivers/acpi/ac.c | 2 +- drivers/acpi/acpi_processor.c | 2 +- drivers/acpi/button.c | 2 +- drivers/acpi/dock.c | 2 +- drivers/acpi/evged.c | 2 +- drivers/acpi/processor_idle.c | 3 +-- drivers/acpi/resource.c | 2 +- drivers/acpi/spcr.c | 4 ++-- drivers/pci/pci-acpi.c | 6 +++--- 9 files changed, 12 insertions(+), 13 deletions(-)drivers/acpi/ac.c +1
-1@@ -236,7 +236,7 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event)default :ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"Unsupported event [0x%x]\n" , event)); -/* fall through */ + fallthrough;case ACPI_AC_NOTIFY_STATUS :case ACPI_NOTIFY_BUS_CHECK :case ACPI_NOTIFY_DEVICE_CHECK :drivers/acpi/acpi_processor.c +1
-1@@ -79,7 +79,7 @@ static int acpi_processor_errata_piix4(struct pci_dev *dev)* PIIX4 models. */ errata.piix4.throttle =1 ; -/* fall through*/ + fallthrough;case 2 :/* PIIX4E */ case 3 :/* PIIX4M */ drivers/acpi/button.c +1
-1@@ -405,7 +405,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)switch (event) {case ACPI_FIXED_HARDWARE_EVENT : event =ACPI_BUTTON_NOTIFY_STATUS ; -/* fall through */ + fallthrough;case ACPI_BUTTON_NOTIFY_STATUS : input = button->input;if (button->type ==ACPI_BUTTON_TYPE_LID ) {drivers/acpi/dock.c +1
-1@@ -469,7 +469,7 @@ int dock_notify(struct acpi_device *adev, u32 event) surprise_removal =1 ; event =ACPI_NOTIFY_EJECT_REQUEST ;/* Fall back */ -/* fall through */ + fallthrough;case ACPI_NOTIFY_EJECT_REQUEST :begin_undock (ds); if ((immediate_undock && !(ds->flags & DOCK_IS_ATA))drivers/acpi/evged.c +1
-1@@ -106,7 +106,7 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares,if (ACPI_SUCCESS (acpi_get_handle (handle, ev_name, &evt_handle)))break ; -/* fall through */ + fallthrough;default :if (ACPI_SUCCESS (acpi_get_handle (handle,"_EVT" , &evt_handle)))break ;drivers/acpi/processor_idle.c +1
-2@@ -203,8 +203,7 @@ static void tsc_check_state(int state)*/ if (boot_cpu_has (X86_FEATURE_NONSTOP_TSC ))return ; - -/*FALL THROUGH*/ + fallthrough;default :/* TSC could halt in idle, so notify users */ if (state >ACPI_STATE_C1 )drivers/acpi/resource.c +1
-1@@ -373,7 +373,7 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity)case ACPI_ACTIVE_BOTH :if (triggering ==ACPI_EDGE_SENSITIVE )return IRQ_TYPE_EDGE_BOTH ; -/* fall through */ + fallthrough;default :return IRQ_TYPE_NONE ; }drivers/acpi/spcr.c +2
-2@@ -111,7 +111,7 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console) table->serial_port.access_width))) {default :pr_err ("Unexpected SPCR Access Width. Defaulting to byte size\n" ); -/* fall through */ + fallthrough;case 8 : iotype ="mmio" ;break ;@@ -128,7 +128,7 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)switch (table->interface_type) {case ACPI_DBG2_ARM_SBSA_32BIT : iotype ="mmio32" ; -/* fall through */ + fallthrough;case ACPI_DBG2_ARM_PL011 :case ACPI_DBG2_ARM_SBSA_GENERIC :case ACPI_DBG2_BCM2835 :drivers/pci/pci-acpi.c +3
-3@@ -527,8 +527,8 @@ static void program_hpx_type3_register(struct pci_dev *dev,return ;break ; -case HPX_CFG_VEND_CAP :/* Fall through */ -case HPX_CFG_DVSEC :/* Fall through */ +case HPX_CFG_VEND_CAP : +case HPX_CFG_DVSEC :default :pci_warn (dev,"Encountered _HPX type 3 with unsupported config space location" );return ;@@ -1001,7 +1001,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) error = -EBUSY ;break ; } -/* Fall through */ + fallthrough;case PCI_D0 :case PCI_D1 :case PCI_D2 :
Quoted 7 lines · Rafael J. Wysocki
Quoted 5 lines · Gustavo A. R. Silva
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.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Gustavo A. R. Silva <[email protected]>Applied as 5.9 material, thanks!
Thanks, Rafael.
--
Gustavo