File tree Expand file tree Collapse file tree 1 file changed +5
-14
lines changed Expand file tree Collapse file tree 1 file changed +5
-14
lines changed Original file line number Diff line number Diff line change @@ -2634,22 +2634,13 @@ int prepare_percpu_nmi(unsigned int irq)
2634
2634
*/
2635
2635
void teardown_percpu_nmi (unsigned int irq )
2636
2636
{
2637
- unsigned long flags ;
2638
- struct irq_desc * desc ;
2639
-
2640
2637
WARN_ON (preemptible ());
2641
2638
2642
- desc = irq_get_desc_lock (irq , & flags ,
2643
- IRQ_GET_DESC_CHECK_PERCPU );
2644
- if (!desc )
2645
- return ;
2646
-
2647
- if (WARN_ON (!irq_is_nmi (desc )))
2648
- goto out ;
2649
-
2650
- irq_nmi_teardown (desc );
2651
- out :
2652
- irq_put_desc_unlock (desc , flags );
2639
+ scoped_irqdesc_get_and_lock (irq , IRQ_GET_DESC_CHECK_PERCPU ) {
2640
+ if (WARN_ON (!irq_is_nmi (scoped_irqdesc )))
2641
+ return ;
2642
+ irq_nmi_teardown (scoped_irqdesc );
2643
+ }
2653
2644
}
2654
2645
2655
2646
static int __irq_get_irqchip_state (struct irq_data * data , enum irqchip_irq_state which , bool * state )
You can’t perform that action at this time.
0 commit comments