diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 16:38:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 16:38:22 -0700 |
| commit | e537b2453ccf8884513201d6afcb62ca0763ecf0 (patch) | |
| tree | a805a7ca6bdc950f2c2cb58e3612cecb492812c8 /drivers/eisa | |
| parent | dfbc90196dfb9a814e7f2e1f4c47aa425452d313 (diff) | |
| download | kernel_samsung_smdk4412-e537b2453ccf8884513201d6afcb62ca0763ecf0.zip kernel_samsung_smdk4412-e537b2453ccf8884513201d6afcb62ca0763ecf0.tar.gz kernel_samsung_smdk4412-e537b2453ccf8884513201d6afcb62ca0763ecf0.tar.bz2 | |
eisa: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Diffstat (limited to 'drivers/eisa')
| -rw-r--r-- | drivers/eisa/eisa-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/eisa/eisa-bus.c b/drivers/eisa/eisa-bus.c index c950bf8..66958b3 100644 --- a/drivers/eisa/eisa-bus.c +++ b/drivers/eisa/eisa-bus.c @@ -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. */ |