UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drivers/net: use nr_irqs 

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-08-19 20:49:50 -07:00 committed by Ingo Molnar
parent 1f45f5621d
commit 60e4ad7a72
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/3c59x.c
View File

@ -90,7 +90,7 @@ static int vortex_debug = 1;
#include <linux/eisa.h> #include <linux/eisa.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <asm/irq.h> /* For NR_IRQS only. */ #include <asm/irq.h> /* For nr_irqs only. */
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -1221,7 +1221,7 @@ static int __devinit vortex_probe1(struct device *gendev,
if (print_info) if (print_info)
printk(", IRQ %d\n", dev->irq); printk(", IRQ %d\n", dev->irq);
/* Tell them about an invalid IRQ. */ /* Tell them about an invalid IRQ. */
if (dev->irq <= 0 || dev->irq >= NR_IRQS) if (dev->irq <= 0 || dev->irq >= nr_irqs)
printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n", printk(KERN_WARNING " *** Warning: IRQ %d is unlikely to work! ***\n",
dev->irq); dev->irq);

4
drivers/net/hamradio/baycom_ser_fdx.c
View File

@ -416,10 +416,10 @@ static int ser12_open(struct net_device *dev)
if (!dev || !bc) if (!dev || !bc)
return -ENXIO; return -ENXIO;
if (!dev->base_addr || dev->base_addr > 0xffff-SER12_EXTENT || if (!dev->base_addr || dev->base_addr > 0xffff-SER12_EXTENT ||
dev->irq < 2 || dev->irq > NR_IRQS) { dev->irq < 2 || dev->irq > nr_irqs) {
printk(KERN_INFO "baycom_ser_fdx: invalid portnumber (max %u) " printk(KERN_INFO "baycom_ser_fdx: invalid portnumber (max %u) "
"or irq (2 <= irq <= %d)\n", "or irq (2 <= irq <= %d)\n",
0xffff-SER12_EXTENT, NR_IRQS); 0xffff-SER12_EXTENT, nr_irqs);
return -ENXIO; return -ENXIO;
} }
if (bc->baud < 300 || bc->baud > 4800) { if (bc->baud < 300 || bc->baud > 4800) {

6
drivers/net/hamradio/scc.c
View File

@ -1465,7 +1465,7 @@ static void z8530_init(void)
printk(KERN_INFO "Init Z8530 driver: %u channels, IRQ", Nchips*2); printk(KERN_INFO "Init Z8530 driver: %u channels, IRQ", Nchips*2);
flag=" "; flag=" ";
for (k = 0; k < NR_IRQS; k++) for (k = 0; k < nr_irqs; k++)
if (Ivec[k].used) if (Ivec[k].used)
{ {
printk("%s%d", flag, k); printk("%s%d", flag, k);
@ -1728,7 +1728,7 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (hwcfg.irq == 2) hwcfg.irq = 9; if (hwcfg.irq == 2) hwcfg.irq = 9;
if (hwcfg.irq < 0 || hwcfg.irq >= NR_IRQS) if (hwcfg.irq < 0 || hwcfg.irq >= nr_irqs)
return -EINVAL; return -EINVAL;
if (!Ivec[hwcfg.irq].used && hwcfg.irq) if (!Ivec[hwcfg.irq].used && hwcfg.irq)
@ -2148,7 +2148,7 @@ static void __exit scc_cleanup_driver(void)
} }
/* To unload the port must be closed so no real IRQ pending */ /* To unload the port must be closed so no real IRQ pending */
for (k=0; k < NR_IRQS ; k++) for (k = 0; k < nr_irqs ; k++)
if (Ivec[k].used) free_irq(k, NULL); if (Ivec[k].used) free_irq(k, NULL);
local_irq_enable(); local_irq_enable();

2
drivers/net/wan/sbni.c
View File

@ -318,7 +318,7 @@ sbni_pci_probe( struct net_device *dev )
continue; continue;
} }
if( pci_irq_line <= 0 || pci_irq_line >= NR_IRQS ) if (pci_irq_line <= 0 || pci_irq_line >= nr_irqs)
printk( KERN_WARNING " WARNING: The PCI BIOS assigned " printk( KERN_WARNING " WARNING: The PCI BIOS assigned "
"this PCI card to IRQ %d, which is unlikely " "this PCI card to IRQ %d, which is unlikely "
"to work!.\n" "to work!.\n"