diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:23 -0400 |
commit | cf43f4ab3a065296822bb245975d006707ccde8d (patch) | |
tree | 6d06c4bd831c6cf0e7a64d317b48dbc1578d236d | |
parent | 3e274bd02b04064632492a86fe99d3b613c74d84 (diff) |
mca: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: James.Bottomley@HansenPartnership.com
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
-rw-r--r-- | drivers/mca/mca-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mca/mca-bus.c b/drivers/mca/mca-bus.c index ef2dbfe74714..ada5ebbaa255 100644 --- a/drivers/mca/mca-bus.c +++ b/drivers/mca/mca-bus.c | |||
@@ -110,7 +110,7 @@ int __init mca_register_device(int bus, struct mca_device *mca_dev) | |||
110 | 110 | ||
111 | mca_dev->dev.parent = &mca_bus->dev; | 111 | mca_dev->dev.parent = &mca_bus->dev; |
112 | mca_dev->dev.bus = &mca_bus_type; | 112 | mca_dev->dev.bus = &mca_bus_type; |
113 | sprintf (mca_dev->dev.bus_id, "%02d:%02X", bus, mca_dev->slot); | 113 | dev_set_name(&mca_dev->dev, "%02d:%02X", bus, mca_dev->slot); |
114 | mca_dev->dma_mask = mca_bus->default_dma_mask; | 114 | mca_dev->dma_mask = mca_bus->default_dma_mask; |
115 | mca_dev->dev.dma_mask = &mca_dev->dma_mask; | 115 | mca_dev->dev.dma_mask = &mca_dev->dma_mask; |
116 | mca_dev->dev.coherent_dma_mask = mca_dev->dma_mask; | 116 | mca_dev->dev.coherent_dma_mask = mca_dev->dma_mask; |
@@ -151,7 +151,7 @@ struct mca_bus * __devinit mca_attach_bus(int bus) | |||
151 | if (!mca_bus) | 151 | if (!mca_bus) |
152 | return NULL; | 152 | return NULL; |
153 | 153 | ||
154 | sprintf(mca_bus->dev.bus_id,"mca%d",bus); | 154 | dev_set_name(&mca_bus->dev, "mca%d", bus); |
155 | sprintf(mca_bus->name,"Host %s MCA Bridge", bus ? "Secondary" : "Primary"); | 155 | sprintf(mca_bus->name,"Host %s MCA Bridge", bus ? "Secondary" : "Primary"); |
156 | if (device_register(&mca_bus->dev)) { | 156 | if (device_register(&mca_bus->dev)) { |
157 | kfree(mca_bus); | 157 | kfree(mca_bus); |