diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:21 -0400 |
commit | 031d5518591006efd13a33a86909b9477b22917b (patch) | |
tree | 3f31dda807e0e129b7e9751e93df649f91530478 /drivers/edac/mv64x60_edac.c | |
parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) |
edac: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: dougthompson@xmission.com
Cc: bluesmoke-devel@lists.sourceforge.net
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Diffstat (limited to 'drivers/edac/mv64x60_edac.c')
-rw-r--r-- | drivers/edac/mv64x60_edac.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |