Skip to content

Commit

Permalink
eisa: struct device - replace bus_id with dev_name(), dev_set_name()
Browse files Browse the repository at this point in the history
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  • Loading branch information
kaysievers authored and gregkh committed Mar 24, 2009
1 parent dfbc901 commit e537b24
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/eisa/eisa-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ static int __init eisa_init_device (struct eisa_root_device *root,
edev->dev.bus = &eisa_bus_type;
edev->dev.dma_mask = &edev->dma_mask;
edev->dev.coherent_dma_mask = edev->dma_mask;
sprintf (edev->dev.bus_id, "%02X:%02X", root->bus_nr, slot);
dev_set_name(&edev->dev, "%02X:%02X", root->bus_nr, slot);

for (i = 0; i < EISA_MAX_RESOURCES; i++) {
#ifdef CONFIG_EISA_NAMES
Expand Down Expand Up @@ -301,7 +301,7 @@ static int __init eisa_probe (struct eisa_root_device *root)
struct eisa_device *edev;

printk (KERN_INFO "EISA: Probing bus %d at %s\n",
root->bus_nr, root->dev->bus_id);
root->bus_nr, dev_name(root->dev));

/* First try to get hold of slot 0. If there is no device
* here, simply fail, unless root->force_probe is set. */
Expand Down

0 comments on commit e537b24

Please sign in to comment.