5 files changed, 119 insertions, 76 deletions

diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 1ce2c675b8a7..a806dfe54d23 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -552,8 +552,7 @@ static int __init do_eepro_probe(struct net_device *dev)
         {
                 unsigned short int WS[32]=WakeupSeq;
 
-                if (check_region(WakeupPort, 2)==0) {
-
+                if (request_region(WakeupPort, 2, "eepro wakeup")) {
                         if (net_debug>5)
                                 printk(KERN_DEBUG "Waking UP\n");
 
@@ -563,7 +562,10 @@ static int __init do_eepro_probe(struct net_device *dev)
                                 outb_p(WS[i],WakeupPort);
                                 if (net_debug>5) printk(KERN_DEBUG ": %#x ",WS[i]);
                         }
-                } else printk(KERN_WARNING "Checkregion Failed!\n");
+
+                        release_region(WakeupPort, 2);
+                } else
+                        printk(KERN_WARNING "PnP wakeup region busy!\n");
         }
 #endif
 
@@ -705,7 +707,7 @@ static void __init eepro_print_info (struct net_device *dev)
                                         dev->name, (unsigned)dev->base_addr);
                         break;
                 case LAN595FX:
-                        printk("%s: Intel EtherExpress Pro/10+ ISA\n at %#x,", 
+                        printk("%s: Intel EtherExpress Pro/10+ ISA\n at %#x,",
                                         dev->name, (unsigned)dev->base_addr);
                         break;
                 case LAN595TX:
@@ -713,7 +715,7 @@ static void __init eepro_print_info (struct net_device *dev)
                                         dev->name, (unsigned)dev->base_addr);
                         break;
                 case LAN595:
-                        printk("%s: Intel 82595-based lan card at %#x,", 
+                        printk("%s: Intel 82595-based lan card at %#x,",
                                         dev->name, (unsigned)dev->base_addr);
         }
 
@@ -726,7 +728,7 @@ static void __init eepro_print_info (struct net_device *dev)
 
         if (dev->irq > 2)
                 printk(", IRQ %d, %s.\n", dev->irq, ifmap[dev->if_port]);
-        else 
+        else
                 printk(", %s.\n", ifmap[dev->if_port]);
 
         if (net_debug > 3) {
@@ -756,7 +758,7 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
         int err;
 
         /* Grab the region so we can find another board if autoIRQ fails. */
-        if (!request_region(ioaddr, EEPRO_IO_EXTENT, DRV_NAME)) { 
+        if (!request_region(ioaddr, EEPRO_IO_EXTENT, DRV_NAME)) {
                 if (!autoprobe)
                         printk(KERN_WARNING "EEPRO: io-port 0x%04x in use \n",
                                 ioaddr);
@@ -838,15 +840,15 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
                 /* Mask off INT number */
                 int count = lp->word[1] & 7;
                 unsigned irqMask = lp->word[7];
- 
+
                 while (count--)
                         irqMask &= irqMask - 1;
- 
+
                 count = ffs(irqMask);
- 
+
                 if (count)
                         dev->irq = count - 1;
- 
+
                 if (dev->irq < 2) {
                         printk(KERN_ERR " Duh! illegal interrupt vector stored in EEPROM.\n");
                         goto exit;
@@ -854,7 +856,7 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
                         dev->irq = 9;
                 }
         }
- 
+
         dev->open               = eepro_open;
         dev->stop               = eepro_close;
         dev->hard_start_xmit    = eepro_send_packet;
@@ -863,7 +865,7 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
         dev->tx_timeout         = eepro_tx_timeout;
         dev->watchdog_timeo     = TX_TIMEOUT;
         dev->ethtool_ops        = &eepro_ethtool_ops;
- 
+
         /* print boot time info */
         eepro_print_info(dev);
 
@@ -1047,8 +1049,8 @@ static int eepro_open(struct net_device *dev)
 
 
         /* Initialize the RCV and XMT upper and lower limits */
-        outb(lp->rcv_lower_limit >> 8, ioaddr + RCV_LOWER_LIMIT_REG); 
-        outb(lp->rcv_upper_limit >> 8, ioaddr + RCV_UPPER_LIMIT_REG); 
+        outb(lp->rcv_lower_limit >> 8, ioaddr + RCV_LOWER_LIMIT_REG);
+        outb(lp->rcv_upper_limit >> 8, ioaddr + RCV_UPPER_LIMIT_REG);
         outb(lp->xmt_lower_limit >> 8, ioaddr + lp->xmt_lower_limit_reg);
         outb(lp->xmt_upper_limit >> 8, ioaddr + lp->xmt_upper_limit_reg);
 
@@ -1065,12 +1067,12 @@ static int eepro_open(struct net_device *dev)
         eepro_clear_int(ioaddr);
 
         /* Initialize RCV */
-        outw(lp->rcv_lower_limit, ioaddr + RCV_BAR); 
+        outw(lp->rcv_lower_limit, ioaddr + RCV_BAR);
         lp->rx_start = lp->rcv_lower_limit;
-        outw(lp->rcv_upper_limit | 0xfe, ioaddr + RCV_STOP); 
+        outw(lp->rcv_upper_limit | 0xfe, ioaddr + RCV_STOP);
 
         /* Initialize XMT */
-        outw(lp->xmt_lower_limit, ioaddr + lp->xmt_bar); 
+        outw(lp->xmt_lower_limit, ioaddr + lp->xmt_bar);
         lp->tx_start = lp->tx_end = lp->xmt_lower_limit;
         lp->tx_last = 0;
 
@@ -1411,7 +1413,7 @@ set_multicast_list(struct net_device *dev)
                                 outb(0x08, ioaddr + STATUS_REG);
 
                                 if (i & 0x20) { /* command ABORTed */
-                                        printk(KERN_NOTICE "%s: multicast setup failed.\n", 
+                                        printk(KERN_NOTICE "%s: multicast setup failed.\n",
                                                 dev->name);
                                         break;
                                 } else if ((i & 0x0f) == 0x03)  { /* MC-Done */
@@ -1512,7 +1514,7 @@ hardware_send_packet(struct net_device *dev, void *buf, short length)
                 end = last + (((length + 3) >> 1) << 1) + XMT_HEADER;
 
         if (end >= lp->xmt_upper_limit + 2) { /* the transmit buffer is wrapped around */
-                if ((lp->xmt_upper_limit + 2 - last) <= XMT_HEADER) {   
+                if ((lp->xmt_upper_limit + 2 - last) <= XMT_HEADER) {
                                 /* Arrrr!!!, must keep the xmt header together,
                                 several days were lost to chase this one down. */
                         last = lp->xmt_lower_limit;
@@ -1643,7 +1645,7 @@ eepro_rx(struct net_device *dev)
                         else if (rcv_status & 0x0800)
                                 lp->stats.rx_crc_errors++;
 
-                        printk(KERN_DEBUG "%s: event = %#x, status = %#x, next = %#x, size = %#x\n", 
+                        printk(KERN_DEBUG "%s: event = %#x, status = %#x, next = %#x, size = %#x\n",
                                 dev->name, rcv_event, rcv_status, rcv_next_frame, rcv_size);
                 }
 
@@ -1674,10 +1676,10 @@ eepro_transmit_interrupt(struct net_device *dev)
 {
         struct eepro_local *lp = netdev_priv(dev);
         short ioaddr = dev->base_addr;
-        short boguscount = 25; 
+        short boguscount = 25;
         short xmt_status;
 
-        while ((lp->tx_start != lp->tx_end) && boguscount--) { 
+        while ((lp->tx_start != lp->tx_end) && boguscount--) {
 
                 outw(lp->tx_start, ioaddr + HOST_ADDRESS_REG);
                 xmt_status = inw(ioaddr+IO_PORT);
@@ -1723,7 +1725,7 @@ static int eepro_ethtool_get_settings(struct net_device *dev,
 {
         struct eepro_local      *lp = (struct eepro_local *)dev->priv;
 
-        cmd->supported =        SUPPORTED_10baseT_Half | 
+        cmd->supported =        SUPPORTED_10baseT_Half |
                                 SUPPORTED_10baseT_Full |
                                 SUPPORTED_Autoneg;
         cmd->advertising =      ADVERTISED_10baseT_Half |
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index bbac720cca63..140b7cdb1f7e 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -638,21 +638,14 @@ static void smsc_ircc_setup_qos(struct smsc_ircc_cb *self)
  */
 static void smsc_ircc_init_chip(struct smsc_ircc_cb *self)
 {
-        int iobase, ir_mode, ctrl, fast;
-
-        IRDA_ASSERT(self != NULL, return;);
-
-        iobase = self->io.fir_base;
-        ir_mode = IRCC_CFGA_IRDA_SIR_A;
-        ctrl = 0;
-        fast = 0;
+        int iobase = self->io.fir_base;
 
         register_bank(iobase, 0);
         outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
         outb(0x00, iobase + IRCC_MASTER);
 
         register_bank(iobase, 1);
-        outb(((inb(iobase + IRCC_SCE_CFGA) & 0x87) | ir_mode),
+        outb(((inb(iobase + IRCC_SCE_CFGA) & 0x87) | IRCC_CFGA_IRDA_SIR_A),
              iobase + IRCC_SCE_CFGA);
 
 #ifdef smsc_669 /* Uses pin 88/89 for Rx/Tx */
@@ -666,10 +659,10 @@ static void smsc_ircc_init_chip(struct smsc_ircc_cb *self)
         outb(SMSC_IRCC2_FIFO_THRESHOLD, iobase + IRCC_FIFO_THRESHOLD);
 
         register_bank(iobase, 4);
-        outb((inb(iobase + IRCC_CONTROL) & 0x30) | ctrl, iobase + IRCC_CONTROL);
+        outb((inb(iobase + IRCC_CONTROL) & 0x30), iobase + IRCC_CONTROL);
 
         register_bank(iobase, 0);
-        outb(fast, iobase + IRCC_LCR_A);
+        outb(0, iobase + IRCC_LCR_A);
 
         smsc_ircc_set_sir_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
 
@@ -1556,6 +1549,46 @@ static int ircc_is_receiving(struct smsc_ircc_cb *self)
 }
 #endif /* unused */
 
+static int smsc_ircc_request_irq(struct smsc_ircc_cb *self)
+{
+        int error;
+
+        error = request_irq(self->io.irq, smsc_ircc_interrupt, 0,
+                            self->netdev->name, self->netdev);
+        if (error)
+                IRDA_DEBUG(0, "%s(), unable to allocate irq=%d, err=%d\n",
+                           __FUNCTION__, self->io.irq, error);
+
+        return error;
+}
+
+static void smsc_ircc_start_interrupts(struct smsc_ircc_cb *self)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&self->lock, flags);
+
+        self->io.speed = 0;
+        smsc_ircc_change_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
+
+        spin_unlock_irqrestore(&self->lock, flags);
+}
+
+static void smsc_ircc_stop_interrupts(struct smsc_ircc_cb *self)
+{
+        int iobase = self->io.fir_base;
+        unsigned long flags;
+
+        spin_lock_irqsave(&self->lock, flags);
+
+        register_bank(iobase, 0);
+        outb(0, iobase + IRCC_IER);
+        outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
+        outb(0x00, iobase + IRCC_MASTER);
+
+        spin_unlock_irqrestore(&self->lock, flags);
+}
+
 
 /*
  * Function smsc_ircc_net_open (dev)
@@ -1567,7 +1600,6 @@ static int smsc_ircc_net_open(struct net_device *dev)
 {
         struct smsc_ircc_cb *self;
         char hwname[16];
-        unsigned long flags;
 
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
@@ -1575,6 +1607,11 @@ static int smsc_ircc_net_open(struct net_device *dev)
         self = netdev_priv(dev);
         IRDA_ASSERT(self != NULL, return 0;);
 
+        if (self->io.suspended) {
+                IRDA_DEBUG(0, "%s(), device is suspended\n", __FUNCTION__);
+                return -EAGAIN;
+        }
+
         if (request_irq(self->io.irq, smsc_ircc_interrupt, 0, dev->name,
                         (void *) dev)) {
                 IRDA_DEBUG(0, "%s(), unable to allocate irq=%d\n",
@@ -1582,11 +1619,7 @@ static int smsc_ircc_net_open(struct net_device *dev)
                 return -EAGAIN;
         }
 
-        spin_lock_irqsave(&self->lock, flags);
-        /*smsc_ircc_sir_start(self);*/
-        self->io.speed = 0;
-        smsc_ircc_change_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
-        spin_unlock_irqrestore(&self->lock, flags);
+        smsc_ircc_start_interrupts(self);
 
         /* Give self a hardware name */
         /* It would be cool to offer the chip revision here - Jean II */
@@ -1639,7 +1672,12 @@ static int smsc_ircc_net_close(struct net_device *dev)
                 irlap_close(self->irlap);
         self->irlap = NULL;
 
-        free_irq(self->io.irq, dev);
+        smsc_ircc_stop_interrupts(self);
+
+        /* if we are called from smsc_ircc_resume we don't have IRQ reserved */
+        if (!self->io.suspended)
+                free_irq(self->io.irq, dev);
+
         disable_dma(self->io.dma);
         free_dma(self->io.dma);
 
@@ -1650,11 +1688,18 @@ static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
 {
         struct smsc_ircc_cb *self = dev_get_drvdata(dev);
 
-        IRDA_MESSAGE("%s, Suspending\n", driver_name);
-
         if (!self->io.suspended) {
-                smsc_ircc_net_close(self->netdev);
+                IRDA_DEBUG(1, "%s, Suspending\n", driver_name);
+
+                rtnl_lock();
+                if (netif_running(self->netdev)) {
+                        netif_device_detach(self->netdev);
+                        smsc_ircc_stop_interrupts(self);
+                        free_irq(self->io.irq, self->netdev);
+                        disable_dma(self->io.dma);
+                }
                 self->io.suspended = 1;
+                rtnl_unlock();
         }
 
         return 0;
@@ -1665,11 +1710,25 @@ static int smsc_ircc_resume(struct device *dev)
         struct smsc_ircc_cb *self = dev_get_drvdata(dev);
 
         if (self->io.suspended) {
-
-                smsc_ircc_net_open(self->netdev);
+                IRDA_DEBUG(1, "%s, Waking up\n", driver_name);
+
+                rtnl_lock();
+                smsc_ircc_init_chip(self);
+                if (netif_running(self->netdev)) {
+                        if (smsc_ircc_request_irq(self)) {
+                                /*
+                                 * Don't fail resume process, just kill this
+                                 * network interface
+                                 */
+                                unregister_netdevice(self->netdev);
+                        } else {
+                                enable_dma(self->io.dma);
+                                smsc_ircc_start_interrupts(self);
+                                netif_device_attach(self->netdev);
+                        }
+                }
                 self->io.suspended = 0;
-
-                IRDA_MESSAGE("%s, Waking up\n", driver_name);
+                rtnl_unlock();
         }
         return 0;
 }
@@ -1682,9 +1741,6 @@ static int smsc_ircc_resume(struct device *dev)
  */
 static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
 {
-        int iobase;
-        unsigned long flags;
-
         IRDA_DEBUG(1, "%s\n", __FUNCTION__);
 
         IRDA_ASSERT(self != NULL, return -1;);
@@ -1694,22 +1750,7 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
         /* Remove netdevice */
         unregister_netdev(self->netdev);
 
-        /* Make sure the irq handler is not exectuting */
-        spin_lock_irqsave(&self->lock, flags);
-
-        /* Stop interrupts */
-        iobase = self->io.fir_base;
-        register_bank(iobase, 0);
-        outb(0, iobase + IRCC_IER);
-        outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
-        outb(0x00, iobase + IRCC_MASTER);
-#if 0
-        /* Reset to SIR mode */
-        register_bank(iobase, 1);
-        outb(IRCC_CFGA_IRDA_SIR_A|IRCC_CFGA_TX_POLARITY, iobase + IRCC_SCE_CFGA);
-        outb(IRCC_CFGB_IR, iobase + IRCC_SCE_CFGB);
-#endif
-        spin_unlock_irqrestore(&self->lock, flags);
+        smsc_ircc_stop_interrupts(self);
 
         /* Release the PORTS that this driver is using */
         IRDA_DEBUG(0, "%s(), releasing 0x%03x\n",  __FUNCTION__,
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index f17c05cbe44b..99a776a51fb5 100644
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -1896,7 +1896,7 @@ void smt_swap_para(struct smt_header *sm, int len, int direction)
 
 static void smt_string_swap(char *data, const char *format, int len)
 {
-        const char      *open_paren = 0 ;
+        const char      *open_paren = NULL ;
         int     x ;
 
         while (len > 0  && *format) {
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index ac9ce6509eee..817f200742c3 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -230,12 +230,12 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define SMC_CAN_USE_16BIT       1
 #define SMC_CAN_USE_32BIT       0
 
-#define SMC_inb(a, r)           inb((a) + (r) - 0xa0000000)
-#define SMC_inw(a, r)           inw((a) + (r) - 0xa0000000)
-#define SMC_outb(v, a, r)       outb(v, (a) + (r) - 0xa0000000)
-#define SMC_outw(v, a, r)       outw(v, (a) + (r) - 0xa0000000)
-#define SMC_insw(a, r, p, l)    insw((a) + (r) - 0xa0000000, p, l)
-#define SMC_outsw(a, r, p, l)   outsw((a) + (r) - 0xa0000000, p, l)
+#define SMC_inb(a, r)           inb((u32)a) + (r))
+#define SMC_inw(a, r)           inw(((u32)a) + (r))
+#define SMC_outb(v, a, r)       outb(v, ((u32)a) + (r))
+#define SMC_outw(v, a, r)       outw(v, ((u32)a) + (r))
+#define SMC_insw(a, r, p, l)    insw(((u32)a) + (r), p, l)
+#define SMC_outsw(a, r, p, l)   outsw(((u32)a) + (r), p, l)
 
 #define set_irq_type(irq, type) do {} while(0)
 
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 4937a5ad4b2c..6a60c5970cb5 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -137,7 +137,7 @@ islpci_mgmt_rx_fill(struct net_device *ndev)
                                                        PCI_DMA_FROMDEVICE);
                         if (!buf->pci_addr) {
                                 printk(KERN_WARNING
-                                       "Failed to make memory DMA'able\n.");
+                                       "Failed to make memory DMA'able.\n");
                                 return -ENOMEM;
                         }
                 }