Skip to content

Commit

Permalink
edac: AMD8111 & AMD8131 use dev_name()
Browse files Browse the repository at this point in the history
The "bus_id" member in the device structure has been obsolete, use
dev_name() instead.

Signed-off-by: Harry Ciao <[email protected]>
Cc: Doug Thompson <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
qcao-zz authored and torvalds committed May 29, 2009
1 parent 46f7e60 commit 56ec0c7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/edac/amd8111_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/edac/amd8131_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 56ec0c7

Please sign in to comment.