Skip to content

Commit e537b24

Browse files
kaysieversgregkh
authored andcommitted
eisa: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Kay Sievers <[email protected]>
1 parent dfbc901 commit e537b24

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/eisa/eisa-bus.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static int __init eisa_init_device (struct eisa_root_device *root,
200200
edev->dev.bus = &eisa_bus_type;
201201
edev->dev.dma_mask = &edev->dma_mask;
202202
edev->dev.coherent_dma_mask = edev->dma_mask;
203-
sprintf (edev->dev.bus_id, "%02X:%02X", root->bus_nr, slot);
203+
dev_set_name(&edev->dev, "%02X:%02X", root->bus_nr, slot);
204204

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

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

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

0 commit comments

Comments
 (0)