Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / powerpc / platforms / pseries / eeh_driver.c

diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index ef8e454..b8d70f5 100644 (file)
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -337,7 +337,7 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
                location = location ? location : "unknown";
                printk(KERN_ERR "EEH: Error: Cannot find partition endpoint "
                                "for location=%s pci addr=%s\n",
-                       location, pci_name(event->dev));
+                       location, eeh_pci_name(event->dev));
                return NULL;
        }
 
@@ -368,7 +368,7 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
                pci_str = pci_name (frozen_pdn->pcidev);
                drv_str = pcid_name (frozen_pdn->pcidev);
        } else {
-               pci_str = pci_name (event->dev);
+               pci_str = eeh_pci_name(event->dev);
                drv_str = pcid_name (event->dev);
        }
        
@@ -478,9 +478,9 @@ excess_failures:
         * due to actual, failed cards.
         */
        printk(KERN_ERR
-          "EEH: PCI device at location=%s driver=%s pci addr=%s \n"
+          "EEH: PCI device at location=%s driver=%s pci addr=%s\n"
                "has failed %d times in the last hour "
-               "and has been permanently disabled. \n"
+               "and has been permanently disabled.\n"
                "Please try reseating this device or replacing it.\n",
                location, drv_str, pci_str, frozen_pdn->eeh_freeze_count);
        goto perm_error;
@@ -488,7 +488,7 @@ excess_failures:
 hard_fail:
        printk(KERN_ERR
           "EEH: Unable to recover from failure of PCI device "
-          "at location=%s driver=%s pci addr=%s \n"
+          "at location=%s driver=%s pci addr=%s\n"
           "Please try reseating this device or replacing it.\n",
                location, drv_str, pci_str);