11 files changed, 18 insertions, 12 deletions

diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
index 00d52544d149..40c763231ecc 100644
--- a/drivers/edac/amd76x_edac.c
+++ b/drivers/edac/amd76x_edac.c
@@ -253,6 +253,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
         mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = AMD76X_REVISION;
         mci->ctl_name = amd76x_devs[dev_idx].ctl_name;
+        mci->dev_name = pci_name(pdev);
         mci->edac_check = amd76x_check;
         mci->ctl_page_to_phys = NULL;
 
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
index 9460edd361c7..10f84995472d 100644
--- a/drivers/edac/e752x_edac.c
+++ b/drivers/edac/e752x_edac.c
@@ -1004,6 +1004,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
 
         debugf3("%s(): more mci init\n", __func__);
         mci->ctl_name = pvt->dev_info->ctl_name;
+        mci->dev_name = pci_name(pdev);
         mci->edac_check = e752x_check;
         mci->ctl_page_to_phys = ctl_page_to_phys;
 
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
index 367eb99c1d07..5202bbf2e0cd 100644
--- a/drivers/edac/e7xxx_edac.c
+++ b/drivers/edac/e7xxx_edac.c
@@ -463,6 +463,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
 
         debugf3("%s(): more mci init\n", __func__);
         mci->ctl_name = pvt->dev_info->ctl_name;
+        mci->dev_name = pci_name(pdev);
         mci->edac_check = e7xxx_check;
         mci->ctl_page_to_phys = ctl_page_to_phys;
         e7xxx_init_csrows(mci, pdev, dev_idx, drc);
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 968f48399e00..f34ebb609d55 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -95,11 +95,7 @@ extern int edac_debug_level;
 #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \
         PCI_DEVICE_ID_ ## vend ## _ ## dev
 
-#if defined(CONFIG_X86) && defined(CONFIG_PCI)
-#define dev_name(dev) pci_name(to_pci_dev(dev))
-#else
-#define dev_name(dev) to_platform_device(dev)->name
-#endif
+#define dev_name(dev) (dev)->dev_name
 
 /* memory devices */
 enum dev_type {
@@ -368,6 +364,7 @@ struct mem_ctl_info {
         const char *mod_name;
         const char *mod_ver;
         const char *ctl_name;
+        const char *dev_name;
         char proc_name[MC_PROC_NAME_MAX_LEN + 1];
         void *pvt_info;
         u32 ue_noinfo_count;    /* Uncorrectable Errors w/o info */
@@ -538,6 +535,7 @@ struct edac_device_ctl_info {
 
         const char *mod_name;   /* module name */
         const char *ctl_name;   /* edac controller  name */
+        const char *dev_name;   /* pci/platform/etc... name */
 
         void *pvt_info;         /* pointer to 'private driver' info */
 
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index c579c498cc75..52db1b14fff5 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -264,7 +264,7 @@ static int add_edac_dev_to_global_list (struct edac_device_ctl_info *edac_dev)
 fail0:
         edac_printk(KERN_WARNING, EDAC_MC,
                 "%s (%s) %s %s already assigned %d\n",
-                rover->dev->bus_id, dev_name(rover->dev),
+                rover->dev->bus_id, dev_name(rover),
                 rover->mod_name, rover->ctl_name, rover->dev_idx);
         return 1;
 
@@ -491,7 +491,7 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev, int edac_idx)
                 "Giving out device to module '%s' controller '%s': DEV '%s' (%s)\n",
                 edac_dev->mod_name,
                 edac_dev->ctl_name,
-                dev_name(edac_dev->dev),
+                dev_name(edac_dev),
                 edac_op_state_toString(edac_dev)
                 );
 
@@ -553,7 +553,7 @@ struct edac_device_ctl_info * edac_device_del_device(struct device *dev)
                 edac_dev->dev_idx,
                 edac_dev->mod_name,
                 edac_dev->ctl_name,
-                dev_name(edac_dev->dev));
+                dev_name(edac_dev));
 
         return edac_dev;
 }
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 7c5fdd1ee972..d324e1eadd3c 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -248,7 +248,7 @@ static int add_mc_to_global_list (struct mem_ctl_info *mci)
 fail0:
         edac_printk(KERN_WARNING, EDAC_MC,
                     "%s (%s) %s %s already assigned %d\n", p->dev->bus_id,
-                    dev_name(p->dev), p->mod_name, p->ctl_name, p->mc_idx);
+                    dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);
         return 1;
 
 fail1:
@@ -353,7 +353,7 @@ int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)
 
         /* Report action taken */
         edac_mc_printk(mci, KERN_INFO, "Giving out device to %s %s: DEV %s\n",
-                mci->mod_name, mci->ctl_name, dev_name(mci->dev));
+                mci->mod_name, mci->ctl_name, dev_name(mci));
 
         mutex_unlock(&mem_ctls_mutex);
         return 0;
@@ -391,7 +391,7 @@ struct mem_ctl_info * edac_mc_del_mc(struct device *dev)
         mutex_unlock(&mem_ctls_mutex);
         edac_printk(KERN_INFO, EDAC_MC,
                 "Removed device %d for %s %s: DEV %s\n", mci->mc_idx,
-                mci->mod_name, mci->ctl_name, dev_name(mci->dev));
+                mci->mod_name, mci->ctl_name, dev_name(mci));
         return mci;
 }
 EXPORT_SYMBOL_GPL(edac_mc_del_mc);
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index f6b9ef73c6cc..af6faeeaa4f6 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -1345,6 +1345,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
         mci->mod_name = "i5000_edac.c";
         mci->mod_ver = I5000_REVISION;
         mci->ctl_name = i5000_devs[dev_idx].ctl_name;
+        mci->dev_name = pci_name(pdev);
         mci->ctl_page_to_phys = NULL;
 
         /* Set the function pointer to an actual operation function */
diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
index a94bb38ea8e4..f88ea075ff2d 100644
--- a/drivers/edac/i82443bxgx_edac.c
+++ b/drivers/edac/i82443bxgx_edac.c
@@ -318,6 +318,7 @@ static int  i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
         mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = I82443_REVISION;
         mci->ctl_name = "I82443BXGX";
+        mci->dev_name = pci_name(pdev);
         mci->edac_check = i82443bxgx_edacmc_check;
         mci->ctl_page_to_phys = NULL;
 
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
index 427de5772038..183427853d04 100644
--- a/drivers/edac/i82860_edac.c
+++ b/drivers/edac/i82860_edac.c
@@ -200,6 +200,7 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
         mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = I82860_REVISION;
         mci->ctl_name = i82860_devs[dev_idx].ctl_name;
+        mci->dev_name = pci_name(pdev);
         mci->edac_check = i82860_check;
         mci->ctl_page_to_phys = NULL;
         i82860_init_csrows(mci, pdev);
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
index c53f08d764c4..485525e4e8e8 100644
--- a/drivers/edac/i82875p_edac.c
+++ b/drivers/edac/i82875p_edac.c
@@ -407,6 +407,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
         mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = I82875P_REVISION;
         mci->ctl_name = i82875p_devs[dev_idx].ctl_name;
+        mci->dev_name = pci_name(pdev);
         mci->edac_check = i82875p_check;
         mci->ctl_page_to_phys = NULL;
         debugf3("%s(): init pvt\n", __func__);
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
index bc322001114b..4285958c73b7 100644
--- a/drivers/edac/r82600_edac.c
+++ b/drivers/edac/r82600_edac.c
@@ -11,7 +11,7 @@
  *
  * Written with reference to 82600 High Integration Dual PCI System
  * Controller Data Book:
- * http://www.radisys.com/files/support_downloads/007-01277-0002.82600DataBook.pdf
+ * www.radisys.com/files/support_downloads/007-01277-0002.82600DataBook.pdf
  * references to this document given in []
  */
 
@@ -305,6 +305,7 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
         mci->mod_name = EDAC_MOD_STR;
         mci->mod_ver = R82600_REVISION;
         mci->ctl_name = "R82600";
+        mci->dev_name = pci_name(pdev);
         mci->edac_check = r82600_check;
         mci->ctl_page_to_phys = NULL;
         r82600_init_csrows(mci, pdev, dramcr);