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

Commit 56ec0c7b authored by Harry Ciao's avatar Harry Ciao Committed by Linus Torvalds
Browse files

edac: AMD8111 & AMD8131 use dev_name() 



The "bus_id" member in the device structure has been obsolete, use
dev_name() instead.

Signed-off-by: default avatarHarry Ciao <qingtao.cao@windriver.com>
Cc: Doug Thompson <norsk5@yahoo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 46f7e602

drivers/edac/amd8111_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static int amd8111_dev_probe(struct pci_dev *dev, 
	dev_info->edac_dev->dev = &dev_info->dev->dev;

	dev_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;

	dev_info->edac_dev->ctl_name = dev_info->ctl_name;

	dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;

	dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);



	if (edac_op_state == EDAC_OPSTATE_POLL)

		dev_info->edac_dev->edac_check = dev_info->check;
@@ -473,7 +473,7 @@ static int amd8111_pci_probe(struct pci_dev *dev, 
	pci_info->edac_dev->dev = &pci_info->dev->dev;

	pci_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;

	pci_info->edac_dev->ctl_name = pci_info->ctl_name;

	pci_info->edac_dev->dev_name = pci_info->dev->dev.bus_id;

	pci_info->edac_dev->dev_name = dev_name(&pci_info->dev->dev);



	if (edac_op_state == EDAC_OPSTATE_POLL)

		pci_info->edac_dev->edac_check = pci_info->check;

drivers/edac/amd8131_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int amd8131_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	dev_info->edac_dev->dev = &dev_info->dev->dev;

	dev_info->edac_dev->mod_name = AMD8131_EDAC_MOD_STR;

	dev_info->edac_dev->ctl_name = dev_info->ctl_name;

	dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;

	dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);



	if (edac_op_state == EDAC_OPSTATE_POLL)

		dev_info->edac_dev->edac_check = amd8131_chipset.check;