mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 12:44:11 +08:00
edac: struct device: replace bus_id with dev_name(), dev_set_name()
This patch is part of a larger patch series which will remove the "char bus_id[20]" name string from struct device. The device name is managed in the kobject anyway, and without any size limitation, and just needlessly copied into "struct device". [akpm@linux-foundation.org: coding-style fixes] Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Doug Thompson <dougthompson@xmission.com> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
1dca00bd02
commit
281efb17d8
@ -333,7 +333,7 @@ static int add_edac_dev_to_global_list(struct edac_device_ctl_info *edac_dev)
|
||||
fail0:
|
||||
edac_printk(KERN_WARNING, EDAC_MC,
|
||||
"%s (%s) %s %s already assigned %d\n",
|
||||
rover->dev->bus_id, edac_dev_name(rover),
|
||||
dev_name(rover->dev), edac_dev_name(rover),
|
||||
rover->mod_name, rover->ctl_name, rover->dev_idx);
|
||||
return 1;
|
||||
|
||||
|
@ -401,7 +401,7 @@ static int add_mc_to_global_list(struct mem_ctl_info *mci)
|
||||
|
||||
fail0:
|
||||
edac_printk(KERN_WARNING, EDAC_MC,
|
||||
"%s (%s) %s %s already assigned %d\n", p->dev->bus_id,
|
||||
"%s (%s) %s %s already assigned %d\n", dev_name(p->dev),
|
||||
edac_dev_name(mci), p->mod_name, p->ctl_name, p->mc_idx);
|
||||
return 1;
|
||||
|
||||
|
@ -150,7 +150,7 @@ static int add_edac_pci_to_global_list(struct edac_pci_ctl_info *pci)
|
||||
fail0:
|
||||
edac_printk(KERN_WARNING, EDAC_PCI,
|
||||
"%s (%s) %s %s already assigned %d\n",
|
||||
rover->dev->bus_id, edac_dev_name(rover),
|
||||
dev_name(rover->dev), edac_dev_name(rover),
|
||||
rover->mod_name, rover->ctl_name, rover->pci_idx);
|
||||
return 1;
|
||||
|
||||
|
@ -569,7 +569,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
|
||||
|
||||
local_irq_restore(flags);
|
||||
|
||||
debugf4("PCI STATUS= 0x%04x %s\n", status, dev->dev.bus_id);
|
||||
debugf4("PCI STATUS= 0x%04x %s\n", status, dev_name(&dev->dev));
|
||||
|
||||
/* check the status reg for errors on boards NOT marked as broken
|
||||
* if broken, we cannot trust any of the status bits
|
||||
@ -600,13 +600,13 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
|
||||
}
|
||||
|
||||
|
||||
debugf4("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev->dev.bus_id);
|
||||
debugf4("PCI HEADER TYPE= 0x%02x %s\n", header_type, dev_name(&dev->dev));
|
||||
|
||||
if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {
|
||||
/* On bridges, need to examine secondary status register */
|
||||
status = get_pci_parity_status(dev, 1);
|
||||
|
||||
debugf4("PCI SEC_STATUS= 0x%04x %s\n", status, dev->dev.bus_id);
|
||||
debugf4("PCI SEC_STATUS= 0x%04x %s\n", status, dev_name(&dev->dev));
|
||||
|
||||
/* check the secondary status reg for errors,
|
||||
* on NOT broken boards
|
||||
|
Loading…
Reference in New Issue
Block a user