commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / tulip / tulip_core.c

diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 1effbc0..df2cd80 100644 (file)
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -194,7 +194,7 @@ struct tulip_chip_table tulip_tbl[] = {
 };
 
 
-static struct pci_device_id tulip_pci_tbl[] __devinitdata = {
+static struct pci_device_id tulip_pci_tbl[] = {
        { 0x1011, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21140 },
        { 0x1011, 0x0019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21143 },
        { 0x11AD, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, LC82C168 },
@@ -858,7 +858,7 @@ static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
                struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO};
                strcpy(info.driver, DRV_NAME);
                strcpy(info.version, DRV_VERSION);
-               strcpy(info.bus_info, np->pdev->slot_name);
+               strcpy(info.bus_info, pci_name(np->pdev));
                if (copy_to_user(useraddr, &info, sizeof(info)))
                        return -EFAULT;
                return 0;
@@ -1172,7 +1172,7 @@ static void __devinit tulip_mwi_config (struct pci_dev *pdev,
        u32 csr0;
 
        if (tulip_debug > 3)
-               printk(KERN_DEBUG "%s: tulip_mwi_config()\n", pdev->slot_name);
+               printk(KERN_DEBUG "%s: tulip_mwi_config()\n", pci_name(pdev));
 
        tp->csr0 = csr0 = 0;
 
@@ -1240,7 +1240,7 @@ out:
        tp->csr0 = csr0;
        if (tulip_debug > 2)
                printk(KERN_DEBUG "%s: MWI config cacheline=%d, csr0=%08x\n",
-                      pdev->slot_name, cache, csr0);
+                      pci_name(pdev), cache, csr0);
 }
 #endif
 
@@ -1365,7 +1365,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
        SET_NETDEV_DEV(dev, &pdev->dev);
        if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) {
                printk (KERN_ERR PFX "%s: I/O region (0x%lx@0x%lx) too small, "
-                       "aborting\n", pdev->slot_name,
+                       "aborting\n", pci_name(pdev),
                        pci_resource_len (pdev, 0),
                        pci_resource_start (pdev, 0));
                goto err_out_free_netdev;