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

Commit e537b245 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

eisa: struct device - replace bus_id with dev_name(), dev_set_name() 



Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
parent dfbc9019

drivers/eisa/eisa-bus.c

+2 −2
Original line number Diff line number Diff line
@@ -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
@@ -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. */