@@ -564,7 +564,7 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
564
564
/* The release function is promised process context */
565
565
might_sleep ();
566
566
567
- if (!desc || desc -> istate & IRQS_NMI )
567
+ if (!desc || irq_is_nmi ( desc ) )
568
568
return - EINVAL ;
569
569
570
570
/* Complete initialisation of *notify */
@@ -902,7 +902,7 @@ int irq_set_irq_wake(unsigned int irq, unsigned int on)
902
902
return - EINVAL ;
903
903
904
904
/* Don't use NMIs as wake up interrupts please */
905
- if (desc -> istate & IRQS_NMI ) {
905
+ if (irq_is_nmi ( desc ) ) {
906
906
ret = - EINVAL ;
907
907
goto out_unlock ;
908
908
}
@@ -1628,7 +1628,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
1628
1628
*/
1629
1629
unsigned int oldtype ;
1630
1630
1631
- if (desc -> istate & IRQS_NMI ) {
1631
+ if (irq_is_nmi ( desc ) ) {
1632
1632
pr_err ("Invalid attempt to share NMI for %s (irq %d) on irqchip %s.\n" ,
1633
1633
new -> name , irq , desc -> irq_data .chip -> name );
1634
1634
ret = - EINVAL ;
@@ -2081,7 +2081,7 @@ const void *free_nmi(unsigned int irq, void *dev_id)
2081
2081
unsigned long flags ;
2082
2082
const void * devname ;
2083
2083
2084
- if (!desc || WARN_ON (!(desc -> istate & IRQS_NMI )))
2084
+ if (!desc || WARN_ON (!irq_is_nmi (desc )))
2085
2085
return NULL ;
2086
2086
2087
2087
if (WARN_ON (irq_settings_is_per_cpu_devid (desc )))
@@ -2547,7 +2547,7 @@ void free_percpu_nmi(unsigned int irq, void __percpu *dev_id)
2547
2547
if (!desc || !irq_settings_is_per_cpu_devid (desc ))
2548
2548
return ;
2549
2549
2550
- if (WARN_ON (!(desc -> istate & IRQS_NMI )))
2550
+ if (WARN_ON (!irq_is_nmi (desc )))
2551
2551
return ;
2552
2552
2553
2553
kfree (__free_percpu_irq (irq , dev_id ));
@@ -2683,7 +2683,7 @@ int request_percpu_nmi(unsigned int irq, irq_handler_t handler,
2683
2683
return - EINVAL ;
2684
2684
2685
2685
/* The line cannot already be NMI */
2686
- if (desc -> istate & IRQS_NMI )
2686
+ if (irq_is_nmi ( desc ) )
2687
2687
return - EINVAL ;
2688
2688
2689
2689
action = kzalloc (sizeof (struct irqaction ), GFP_KERNEL );
@@ -2744,7 +2744,7 @@ int prepare_percpu_nmi(unsigned int irq)
2744
2744
if (!desc )
2745
2745
return - EINVAL ;
2746
2746
2747
- if (WARN (!(desc -> istate & IRQS_NMI ),
2747
+ if (WARN (!irq_is_nmi (desc ),
2748
2748
KERN_ERR "prepare_percpu_nmi called for a non-NMI interrupt: irq %u\n" ,
2749
2749
irq )) {
2750
2750
ret = - EINVAL ;
@@ -2786,7 +2786,7 @@ void teardown_percpu_nmi(unsigned int irq)
2786
2786
if (!desc )
2787
2787
return ;
2788
2788
2789
- if (WARN_ON (!(desc -> istate & IRQS_NMI )))
2789
+ if (WARN_ON (!irq_is_nmi (desc )))
2790
2790
goto out ;
2791
2791
2792
2792
irq_nmi_teardown (desc );
0 commit comments