]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: hamradio: scc: Switch to irq_get_nr_irqs()
authorBart Van Assche <bvanassche@acm.org>
Tue, 15 Oct 2024 19:09:41 +0000 (12:09 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 16 Oct 2024 19:56:57 +0000 (21:56 +0200)
Use the irq_get_nr_irqs() function instead of the global variable
'nr_irqs'. Prepare for changing 'nr_irqs' from an exported global
variable into a variable with file scope.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241015190953.1266194-11-bvanassche@acm.org
drivers/net/hamradio/scc.c

index a9184a78650b094afb37057b7bba8433c6906265..c71e522492898e319df2621a848857f970db5a5a 100644 (file)
@@ -1460,6 +1460,7 @@ scc_start_calibrate(struct scc_channel *scc, int duration, unsigned char pattern
 
 static void z8530_init(void)
 {
+       const unsigned int nr_irqs = irq_get_nr_irqs();
        struct scc_channel *scc;
        int chip, k;
        unsigned long flags;
@@ -1735,7 +1736,7 @@ static int scc_net_siocdevprivate(struct net_device *dev,
 
                        if (hwcfg.irq == 2) hwcfg.irq = 9;
 
-                       if (hwcfg.irq < 0 || hwcfg.irq >= nr_irqs)
+                       if (hwcfg.irq < 0 || hwcfg.irq >= irq_get_nr_irqs())
                                return -EINVAL;
                                
                        if (!Ivec[hwcfg.irq].used && hwcfg.irq)
@@ -2117,6 +2118,7 @@ static int __init scc_init_driver (void)
 
 static void __exit scc_cleanup_driver(void)
 {
+       const unsigned int nr_irqs = irq_get_nr_irqs();
        io_port ctrl;
        int k;
        struct scc_channel *scc;