5 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 491ee16da5c1..9ba295d9dd97 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -90,7 +90,7 @@ static int vortex_debug = 1;
 #include <linux/eisa.h>
 #include <linux/bitops.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/uaccess.h>
 
@@ -1221,7 +1221,7 @@ static int __devinit vortex_probe1(struct device *gendev,
         if (print_info)
                 printk(", IRQ %d\n", dev->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",
                            dev->irq);
 
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
index 17ac6975d70d..b6a816e60c0f 100644
--- a/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
@@ -416,10 +416,10 @@ static int ser12_open(struct net_device *dev)
         if (!dev || !bc)
                 return -ENXIO;
         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) "
                                 "or irq (2 <= irq <= %d)\n",
-                                0xffff-SER12_EXTENT, NR_IRQS);
+                                0xffff-SER12_EXTENT, nr_irqs);
                 return -ENXIO;
         }
         if (bc->baud < 300 || bc->baud > 4800) {
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 45ae9d1191d7..c17e39bc5460 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1465,7 +1465,7 @@ static void z8530_init(void)
         printk(KERN_INFO "Init Z8530 driver: %u channels, IRQ", Nchips*2);
         
         flag=" ";
-        for (k = 0; k < NR_IRQS; k++)
+        for (k = 0; k < nr_irqs; k++)
                 if (Ivec[k].used) 
                 {
                         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 < 0 || hwcfg.irq >= NR_IRQS)
+                        if (hwcfg.irq < 0 || hwcfg.irq >= nr_irqs)
                                 return -EINVAL;
                                 
                         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 */
-        for (k=0; k < NR_IRQS ; k++)
+        for (k = 0; k < nr_irqs ; k++)
                 if (Ivec[k].used) free_irq(k, NULL);
                 
         local_irq_enable();
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 38b90e7a7ed3..7914867110ed 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -168,7 +168,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
                         netif_device_detach(pegasus->net);
                 if (netif_msg_drv(pegasus) && printk_ratelimit())
                         dev_err(&pegasus->intf->dev, "%s, status %d\n",
-                                        __FUNCTION__, ret);
+                                        __func__, ret);
                 goto out;
         }
 
@@ -192,7 +192,7 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
         if (!buffer) {
                 if (netif_msg_drv(pegasus))
                         dev_warn(&pegasus->intf->dev, "out of memory in %s\n",
-                                        __FUNCTION__);
+                                        __func__);
                 return -ENOMEM;
         }
         memcpy(buffer, data, size);
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index f972fef87c98..ee51b6a5e605 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -318,7 +318,7 @@ sbni_pci_probe( struct net_device  *dev )
                                 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 "
                                 "this PCI card to IRQ %d, which is unlikely "
                                 "to work!.\n"