Commit 031d5518 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman

edac: struct device - replace bus_id with dev_name(), dev_set_name()

Cc: dougthompson@xmission.com
Cc: bluesmoke-devel@lists.sourceforge.net
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
parent 8e0ee43b
...@@ -198,7 +198,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) ...@@ -198,7 +198,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev)
mci->edac_cap = EDAC_FLAG_EC | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_EC | EDAC_FLAG_SECDED;
mci->mod_name = "cell_edac"; mci->mod_name = "cell_edac";
mci->ctl_name = "MIC"; mci->ctl_name = "MIC";
mci->dev_name = pdev->dev.bus_id; mci->dev_name = dev_name(&pdev->dev);
mci->edac_check = cell_edac_check; mci->edac_check = cell_edac_check;
cell_edac_init_csrows(mci); cell_edac_init_csrows(mci);
......
...@@ -218,7 +218,7 @@ static int __devinit mpc85xx_pci_err_probe(struct of_device *op, ...@@ -218,7 +218,7 @@ static int __devinit mpc85xx_pci_err_probe(struct of_device *op,
pci->dev = &op->dev; pci->dev = &op->dev;
pci->mod_name = EDAC_MOD_STR; pci->mod_name = EDAC_MOD_STR;
pci->ctl_name = pdata->name; pci->ctl_name = pdata->name;
pci->dev_name = op->dev.bus_id; pci->dev_name = dev_name(&op->dev);
if (edac_op_state == EDAC_OPSTATE_POLL) if (edac_op_state == EDAC_OPSTATE_POLL)
pci->edac_check = mpc85xx_pci_check; pci->edac_check = mpc85xx_pci_check;
......
...@@ -121,7 +121,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev) ...@@ -121,7 +121,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev)
pdata->irq = NO_IRQ; pdata->irq = NO_IRQ;
platform_set_drvdata(pdev, pci); platform_set_drvdata(pdev, pci);
pci->dev = &pdev->dev; pci->dev = &pdev->dev;
pci->dev_name = pdev->dev.bus_id; pci->dev_name = dev_name(&pdev->dev);
pci->mod_name = EDAC_MOD_STR; pci->mod_name = EDAC_MOD_STR;
pci->ctl_name = pdata->name; pci->ctl_name = pdata->name;
...@@ -294,7 +294,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev) ...@@ -294,7 +294,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev)
pdata->irq = NO_IRQ; pdata->irq = NO_IRQ;
edac_dev->dev = &pdev->dev; edac_dev->dev = &pdev->dev;
platform_set_drvdata(pdev, edac_dev); platform_set_drvdata(pdev, edac_dev);
edac_dev->dev_name = pdev->dev.bus_id; edac_dev->dev_name = dev_name(&pdev->dev);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!r) { if (!r) {
...@@ -462,7 +462,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev) ...@@ -462,7 +462,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)
pdata->irq = NO_IRQ; pdata->irq = NO_IRQ;
edac_dev->dev = &pdev->dev; edac_dev->dev = &pdev->dev;
platform_set_drvdata(pdev, edac_dev); platform_set_drvdata(pdev, edac_dev);
edac_dev->dev_name = pdev->dev.bus_id; edac_dev->dev_name = dev_name(&pdev->dev);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!r) { if (!r) {
...@@ -713,7 +713,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev) ...@@ -713,7 +713,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mci); platform_set_drvdata(pdev, mci);
pdata->name = "mv64x60_mc_err"; pdata->name = "mv64x60_mc_err";
pdata->irq = NO_IRQ; pdata->irq = NO_IRQ;
mci->dev_name = pdev->dev.bus_id; mci->dev_name = dev_name(&pdev->dev);
pdata->edac_idx = edac_mc_idx++; pdata->edac_idx = edac_mc_idx++;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment