4 files changed, 17 insertions, 25 deletions

diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 804727853d25..e32fee505220 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -373,12 +373,11 @@ marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
                 irq += 0x80;                    /* offset for lsi       */
 
 #if 1
-                printk("PCI:%d:%d:%d (hose %d) [%s] is using MSI\n",
+                printk("PCI:%d:%d:%d (hose %d) is using MSI\n",
                        dev->bus->number, 
                        PCI_SLOT(dev->devfn), 
                        PCI_FUNC(dev->devfn),
-                       hose->index,
-                       pci_pretty_name (dev));
+                       hose->index);
                 printk("  %d message(s) from 0x%04x\n", 
                        1 << ((msg_ctl & PCI_MSI_FLAGS_QSIZE) >> 4),
                        msg_dat);
diff --git a/arch/ppc64/kernel/eeh.c b/arch/ppc64/kernel/eeh.c
index af5272fedadf..4c857a6516fc 100644
--- a/arch/ppc64/kernel/eeh.c
+++ b/arch/ppc64/kernel/eeh.c
@@ -202,10 +202,9 @@ static void pci_addr_cache_print(struct pci_io_addr_cache *cache)
         while (n) {
                 struct pci_io_addr_range *piar;
                 piar = rb_entry(n, struct pci_io_addr_range, rb_node);
-                printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s %s\n",
+                printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s\n",
                        (piar->flags & IORESOURCE_IO) ? "i/o" : "mem", cnt,
-                       piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev),
-                       pci_pretty_name(piar->pcidev));
+                       piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev));
                 cnt++;
                 n = rb_next(n);
         }
@@ -260,8 +259,8 @@ static void __pci_addr_cache_insert_device(struct pci_dev *dev)
 
         dn = pci_device_to_OF_node(dev);
         if (!dn) {
-                printk(KERN_WARNING "PCI: no pci dn found for dev=%s %s\n",
-                        pci_name(dev), pci_pretty_name(dev));
+                printk(KERN_WARNING "PCI: no pci dn found for dev=%s\n",
+                        pci_name(dev));
                 return;
         }
 
@@ -269,8 +268,8 @@ static void __pci_addr_cache_insert_device(struct pci_dev *dev)
         if (!(dn->eeh_mode & EEH_MODE_SUPPORTED) ||
             dn->eeh_mode & EEH_MODE_NOCHECK) {
 #ifdef DEBUG
-                printk(KERN_INFO "PCI: skip building address cache for=%s %s\n",
-                       pci_name(dev), pci_pretty_name(dev));
+                printk(KERN_INFO "PCI: skip building address cache for=%s\n",
+                       pci_name(dev));
 #endif
                 return;
         }
@@ -447,12 +446,12 @@ static void eeh_panic(struct pci_dev *dev, int reset_state)
          * in light of potential corruption, we can use it here.
          */
         if (panic_on_oops)
-                panic("EEH: MMIO failure (%d) on device:%s %s\n", reset_state,
-                      pci_name(dev), pci_pretty_name(dev));
+                panic("EEH: MMIO failure (%d) on device:%s\n", reset_state,
+                      pci_name(dev));
         else {
                 __get_cpu_var(ignored_failures)++;
-                printk(KERN_INFO "EEH: Ignored MMIO failure (%d) on device:%s %s\n",
-                       reset_state, pci_name(dev), pci_pretty_name(dev));
+                printk(KERN_INFO "EEH: Ignored MMIO failure (%d) on device:%s\n",
+                       reset_state, pci_name(dev));
         }
 }
 
@@ -482,8 +481,8 @@ static void eeh_event_handler(void *dummy)
                         break;
 
                 printk(KERN_INFO "EEH: MMIO failure (%d), notifiying device "
-                       "%s %s\n", event->reset_state,
-                       pci_name(event->dev), pci_pretty_name(event->dev));
+                       "%s\n", event->reset_state,
+                       pci_name(event->dev));
 
                 atomic_set(&eeh_fail_count, 0);
                 notifier_call_chain (&eeh_notifier_chain,
@@ -851,8 +850,7 @@ void eeh_add_device_late(struct pci_dev *dev)
                 return;
 
 #ifdef DEBUG
-        printk(KERN_DEBUG "EEH: adding device %s %s\n", pci_name(dev),
-               pci_pretty_name(dev));
+        printk(KERN_DEBUG "EEH: adding device %s\n", pci_name(dev));
 #endif
 
         pci_addr_cache_insert_device (dev);
@@ -873,8 +871,7 @@ void eeh_remove_device(struct pci_dev *dev)
 
         /* Unregister the device with the EEH/PCI address search system */
 #ifdef DEBUG
-        printk(KERN_DEBUG "EEH: remove device %s %s\n", pci_name(dev),
-               pci_pretty_name(dev));
+        printk(KERN_DEBUG "EEH: remove device %s\n", pci_name(dev));
 #endif
         pci_addr_cache_remove_device(dev);
 }
diff --git a/arch/ppc64/kernel/iSeries_VpdInfo.c b/arch/ppc64/kernel/iSeries_VpdInfo.c
index d11c732daf81..5d921792571f 100644
--- a/arch/ppc64/kernel/iSeries_VpdInfo.c
+++ b/arch/ppc64/kernel/iSeries_VpdInfo.c
@@ -264,8 +264,5 @@ void __init iSeries_Device_Information(struct pci_dev *PciDev, int count)
         printk("%d. PCI: Bus%3d, Device%3d, Vendor %04X Frame%3d, Card %4s  ",
                         count, bus, PCI_SLOT(PciDev->devfn), PciDev->vendor,
                         frame, card);
-        if (pci_class_name(PciDev->class >> 8) == 0)
-                printk("0x%04X\n", (int)(PciDev->class >> 8));
-        else
-                printk("%s\n", pci_class_name(PciDev->class >> 8));
+        printk("0x%04X\n", (int)(PciDev->class >> 8));
 }
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index d0d55c7908ef..b5ca7d8347e2 100644
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -84,7 +84,6 @@ static void fixup_broken_pcnet32(struct pci_dev* dev)
         if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
                 dev->vendor = PCI_VENDOR_ID_AMD;
                 pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);
-                pci_name_device(dev);
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32);