1 files changed, 25 insertions, 23 deletions

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index abd6261465f1..e4f4eaff7679 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -93,7 +93,6 @@
 #define DRV_VERSION     "0.9.27"
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/compiler.h>
@@ -769,7 +768,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
         /* dev and priv zeroed in alloc_etherdev */
         dev = alloc_etherdev (sizeof (*tp));
         if (dev == NULL) {
-                printk (KERN_ERR PFX "%s: Unable to alloc new net device\n", pci_name(pdev));
+                dev_err(&pdev->dev, "Unable to alloc new net device\n");
                 return -ENOMEM;
         }
         SET_MODULE_OWNER(dev);
@@ -801,31 +800,31 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
 #ifdef USE_IO_OPS
         /* make sure PCI base addr 0 is PIO */
         if (!(pio_flags & IORESOURCE_IO)) {
-                printk (KERN_ERR PFX "%s: region #0 not a PIO resource, aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "region #0 not a PIO resource, aborting\n");
                 rc = -ENODEV;
                 goto err_out;
         }
         /* check for weird/broken PCI region reporting */
         if (pio_len < RTL_MIN_IO_SIZE) {
-                printk (KERN_ERR PFX "%s: Invalid PCI I/O region size(s), aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "Invalid PCI I/O region size(s), aborting\n");
                 rc = -ENODEV;
                 goto err_out;
         }
 #else
         /* make sure PCI base addr 1 is MMIO */
         if (!(mmio_flags & IORESOURCE_MEM)) {
-                printk (KERN_ERR PFX "%s: region #1 not an MMIO resource, aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "region #1 not an MMIO resource, aborting\n");
                 rc = -ENODEV;
                 goto err_out;
         }
         if (mmio_len < RTL_MIN_IO_SIZE) {
-                printk (KERN_ERR PFX "%s: Invalid PCI mem region size(s), aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "Invalid PCI mem region size(s), aborting\n");
                 rc = -ENODEV;
                 goto err_out;
         }
 #endif
 
-        rc = pci_request_regions (pdev, "8139too");
+        rc = pci_request_regions (pdev, DRV_NAME);
         if (rc)
                 goto err_out;
         disable_dev_on_err = 1;
@@ -836,7 +835,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
 #ifdef USE_IO_OPS
         ioaddr = ioport_map(pio_start, pio_len);
         if (!ioaddr) {
-                printk (KERN_ERR PFX "%s: cannot map PIO, aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "cannot map PIO, aborting\n");
                 rc = -EIO;
                 goto err_out;
         }
@@ -847,7 +846,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
         /* ioremap MMIO region */
         ioaddr = pci_iomap(pdev, 1, 0);
         if (ioaddr == NULL) {
-                printk (KERN_ERR PFX "%s: cannot remap MMIO, aborting\n", pci_name(pdev));
+                dev_err(&pdev->dev, "cannot remap MMIO, aborting\n");
                 rc = -EIO;
                 goto err_out;
         }
@@ -861,8 +860,7 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
 
         /* check for missing/broken hardware */
         if (RTL_R32 (TxConfig) == 0xFFFFFFFF) {
-                printk (KERN_ERR PFX "%s: Chip not responding, ignoring board\n",
-                        pci_name(pdev));
+                dev_err(&pdev->dev, "Chip not responding, ignoring board\n");
                 rc = -EIO;
                 goto err_out;
         }
@@ -876,9 +874,10 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
                 }
 
         /* if unknown chip, assume array element #0, original RTL-8139 in this case */
-        printk (KERN_DEBUG PFX "%s: unknown chip version, assuming RTL-8139\n",
-                pci_name(pdev));
-        printk (KERN_DEBUG PFX "%s: TxConfig = 0x%lx\n", pci_name(pdev), RTL_R32 (TxConfig));
+        dev_printk (KERN_DEBUG, &pdev->dev,
+                    "unknown chip version, assuming RTL-8139\n");
+        dev_printk (KERN_DEBUG, &pdev->dev,
+                    "TxConfig = 0x%lx\n", RTL_R32 (TxConfig));
         tp->chipset = 0;
 
 match:
@@ -955,9 +954,11 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
 
         if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
             pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pci_rev >= 0x20) {
-                printk(KERN_INFO PFX "pci dev %s (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",
-                       pci_name(pdev), pdev->vendor, pdev->device, pci_rev);
-                printk(KERN_INFO PFX "Use the \"8139cp\" driver for improved performance and stability.\n");
+                dev_info(&pdev->dev,
+                           "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",
+                           pdev->vendor, pdev->device, pci_rev);
+                dev_info(&pdev->dev,
+                           "Use the \"8139cp\" driver for improved performance and stability.\n");
         }
 
         i = rtl8139_init_board (pdev, &dev);
@@ -1311,7 +1312,7 @@ static int rtl8139_open (struct net_device *dev)
         int retval;
         void __iomem *ioaddr = tp->mmio_addr;
 
-        retval = request_irq (dev->irq, rtl8139_interrupt, SA_SHIRQ, dev->name, dev);
+        retval = request_irq (dev->irq, rtl8139_interrupt, IRQF_SHARED, dev->name, dev);
         if (retval)
                 return retval;
 
@@ -1341,9 +1342,9 @@ static int rtl8139_open (struct net_device *dev)
         netif_start_queue (dev);
 
         if (netif_msg_ifup(tp))
-                printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#lx IRQ %d"
-                        " GP Pins %2.2x %s-duplex.\n",
-                        dev->name, pci_resource_start (tp->pci_dev, 1),
+                printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#llx IRQ %d"
+                        " GP Pins %2.2x %s-duplex.\n", dev->name,
+                        (unsigned long long)pci_resource_start (tp->pci_dev, 1),
                         dev->irq, RTL_R8 (MediaStatus),
                         tp->mii.full_duplex ? "full" : "half");
 
@@ -1708,6 +1709,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
         void __iomem *ioaddr = tp->mmio_addr;
         unsigned int entry;
         unsigned int len = skb->len;
+        unsigned long flags;
 
         /* Calculate the next Tx descriptor entry. */
         entry = tp->cur_tx % NUM_TX_DESC;
@@ -1724,7 +1726,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
                 return 0;
         }
 
-        spin_lock_irq(&tp->lock);
+        spin_lock_irqsave(&tp->lock, flags);
         RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
                    tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
 
@@ -1735,7 +1737,7 @@ static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
 
         if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
                 netif_stop_queue (dev);
-        spin_unlock_irq(&tp->lock);
+        spin_unlock_irqrestore(&tp->lock, flags);
 
         if (netif_msg_tx_queued(tp))
                 printk (KERN_DEBUG "%s: Queued Tx packet size %u to slot %d.\n",