Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/edac/cell_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) 
	mci->edac_cap = EDAC_FLAG_EC | EDAC_FLAG_SECDED;

	mci->mod_name = "cell_edac";

	mci->ctl_name = "MIC";

	mci->dev_name = pdev->dev.bus_id;

	mci->dev_name = dev_name(&pdev->dev);

	mci->edac_check = cell_edac_check;

	cell_edac_init_csrows(mci);

drivers/edac/mpc85xx_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int __devinit mpc85xx_pci_err_probe(struct of_device *op, 
	pci->dev = &op->dev;

	pci->mod_name = EDAC_MOD_STR;

	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)

		pci->edac_check = mpc85xx_pci_check;

drivers/edac/mv64x60_edac.c

+4 −4
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev) 
	pdata->irq = NO_IRQ;

	platform_set_drvdata(pdev, pci);

	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->ctl_name = pdata->name;
@@ -294,7 +294,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev) 
	pdata->irq = NO_IRQ;

	edac_dev->dev = &pdev->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);

	if (!r) {
@@ -462,7 +462,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev) 
	pdata->irq = NO_IRQ;

	edac_dev->dev = &pdev->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);

	if (!r) {
@@ -713,7 +713,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, mci);

	pdata->name = "mv64x60_mc_err";

	pdata->irq = NO_IRQ;

	mci->dev_name = pdev->dev.bus_id;

	mci->dev_name = dev_name(&pdev->dev);

	pdata->edac_idx = edac_mc_idx++;



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);