diff options
-rw-r--r-- | drivers/edac/cell_edac.c | 2 | ||||
-rw-r--r-- | drivers/edac/mpc85xx_edac.c | 2 | ||||
-rw-r--r-- | drivers/edac/mv64x60_edac.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c index 24f3ca851523..cb0f639f049d 100644 --- a/drivers/edac/cell_edac.c +++ b/drivers/edac/cell_edac.c | |||
@@ -198,7 +198,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) | |||
198 | mci->edac_cap = EDAC_FLAG_EC | EDAC_FLAG_SECDED; | 198 | mci->edac_cap = EDAC_FLAG_EC | EDAC_FLAG_SECDED; |
199 | mci->mod_name = "cell_edac"; | 199 | mci->mod_name = "cell_edac"; |
200 | mci->ctl_name = "MIC"; | 200 | mci->ctl_name = "MIC"; |
201 | mci->dev_name = pdev->dev.bus_id; | 201 | mci->dev_name = dev_name(&pdev->dev); |
202 | mci->edac_check = cell_edac_check; | 202 | mci->edac_check = cell_edac_check; |
203 | cell_edac_init_csrows(mci); | 203 | cell_edac_init_csrows(mci); |
204 | 204 | ||
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 853ef37ec006..4637a4a757df 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
@@ -218,7 +218,7 @@ static int __devinit mpc85xx_pci_err_probe(struct of_device *op, | |||
218 | pci->dev = &op->dev; | 218 | pci->dev = &op->dev; |
219 | pci->mod_name = EDAC_MOD_STR; | 219 | pci->mod_name = EDAC_MOD_STR; |
220 | pci->ctl_name = pdata->name; | 220 | pci->ctl_name = pdata->name; |
221 | pci->dev_name = op->dev.bus_id; | 221 | pci->dev_name = dev_name(&op->dev); |
222 | 222 | ||
223 | if (edac_op_state == EDAC_OPSTATE_POLL) | 223 | if (edac_op_state == EDAC_OPSTATE_POLL) |
224 | pci->edac_check = mpc85xx_pci_check; | 224 | pci->edac_check = mpc85xx_pci_check; |
diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c index 083ce8d0c63d..5131aaae8e03 100644 --- a/drivers/edac/mv64x60_edac.c +++ b/drivers/edac/mv64x60_edac.c | |||
@@ -121,7 +121,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev) | |||
121 | pdata->irq = NO_IRQ; | 121 | pdata->irq = NO_IRQ; |
122 | platform_set_drvdata(pdev, pci); | 122 | platform_set_drvdata(pdev, pci); |
123 | pci->dev = &pdev->dev; | 123 | pci->dev = &pdev->dev; |
124 | pci->dev_name = pdev->dev.bus_id; | 124 | pci->dev_name = dev_name(&pdev->dev); |
125 | pci->mod_name = EDAC_MOD_STR; | 125 | pci->mod_name = EDAC_MOD_STR; |
126 | pci->ctl_name = pdata->name; | 126 | pci->ctl_name = pdata->name; |
127 | 127 | ||
@@ -294,7 +294,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev) | |||
294 | pdata->irq = NO_IRQ; | 294 | pdata->irq = NO_IRQ; |
295 | edac_dev->dev = &pdev->dev; | 295 | edac_dev->dev = &pdev->dev; |
296 | platform_set_drvdata(pdev, edac_dev); | 296 | platform_set_drvdata(pdev, edac_dev); |
297 | edac_dev->dev_name = pdev->dev.bus_id; | 297 | edac_dev->dev_name = dev_name(&pdev->dev); |
298 | 298 | ||
299 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 299 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
300 | if (!r) { | 300 | if (!r) { |
@@ -462,7 +462,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev) | |||
462 | pdata->irq = NO_IRQ; | 462 | pdata->irq = NO_IRQ; |
463 | edac_dev->dev = &pdev->dev; | 463 | edac_dev->dev = &pdev->dev; |
464 | platform_set_drvdata(pdev, edac_dev); | 464 | platform_set_drvdata(pdev, edac_dev); |
465 | edac_dev->dev_name = pdev->dev.bus_id; | 465 | edac_dev->dev_name = dev_name(&pdev->dev); |
466 | 466 | ||
467 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 467 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
468 | if (!r) { | 468 | if (!r) { |
@@ -713,7 +713,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev) | |||
713 | platform_set_drvdata(pdev, mci); | 713 | platform_set_drvdata(pdev, mci); |
714 | pdata->name = "mv64x60_mc_err"; | 714 | pdata->name = "mv64x60_mc_err"; |
715 | pdata->irq = NO_IRQ; | 715 | pdata->irq = NO_IRQ; |
716 | mci->dev_name = pdev->dev.bus_id; | 716 | mci->dev_name = dev_name(&pdev->dev); |
717 | pdata->edac_idx = edac_mc_idx++; | 717 | pdata->edac_idx = edac_mc_idx++; |
718 | 718 | ||
719 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 719 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |