aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-06 13:44:40 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:44:40 -0500
commitcd3ed6b4dd9e20aacaa5bd957ce1a65c90a0cbc4 (patch)
treee03f13317db583f2d87f8d4d264924ef57f36b0d
parent48ef2bb46ce8c2725a171d3afdb0d3563ef2c278 (diff)
i2o: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/message/i2o/device.c8
-rw-r--r--drivers/message/i2o/i2o_proc.c2
-rw-r--r--drivers/message/i2o/iop.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index 54c2e9ae23e5..a7dd03e8d332 100644
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -134,7 +134,7 @@ static void i2o_device_release(struct device *dev)
134{ 134{
135 struct i2o_device *i2o_dev = to_i2o_device(dev); 135 struct i2o_device *i2o_dev = to_i2o_device(dev);
136 136
137 pr_debug("i2o: device %s released\n", dev->bus_id); 137 pr_debug("i2o: device %s released\n", dev_name(dev));
138 138
139 kfree(i2o_dev); 139 kfree(i2o_dev);
140} 140}
@@ -229,8 +229,8 @@ static int i2o_device_add(struct i2o_controller *c, i2o_lct_entry *entry)
229 229
230 i2o_dev->lct_data = *entry; 230 i2o_dev->lct_data = *entry;
231 231
232 snprintf(i2o_dev->device.bus_id, BUS_ID_SIZE, "%d:%03x", c->unit, 232 dev_set_name(&i2o_dev->device, "%d:%03x", c->unit,
233 i2o_dev->lct_data.tid); 233 i2o_dev->lct_data.tid);
234 234
235 i2o_dev->iop = c; 235 i2o_dev->iop = c;
236 i2o_dev->device.parent = &c->device; 236 i2o_dev->device.parent = &c->device;
@@ -281,7 +281,7 @@ static int i2o_device_add(struct i2o_controller *c, i2o_lct_entry *entry)
281 281
282 i2o_driver_notify_device_add_all(i2o_dev); 282 i2o_driver_notify_device_add_all(i2o_dev);
283 283
284 pr_debug("i2o: device %s added\n", i2o_dev->device.bus_id); 284 pr_debug("i2o: device %s added\n", dev_name(&i2o_dev->device));
285 285
286 return 0; 286 return 0;
287 287
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 54a3016ff45d..9a36b5a7de57 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -1300,7 +1300,7 @@ static int i2o_seq_show_dev_name(struct seq_file *seq, void *v)
1300{ 1300{
1301 struct i2o_device *d = (struct i2o_device *)seq->private; 1301 struct i2o_device *d = (struct i2o_device *)seq->private;
1302 1302
1303 seq_printf(seq, "%s\n", d->device.bus_id); 1303 seq_printf(seq, "%s\n", dev_name(&d->device));
1304 1304
1305 return 0; 1305 return 0;
1306} 1306}
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 35c67d1f255e..27cf4af0e13d 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -1072,7 +1072,7 @@ struct i2o_controller *i2o_iop_alloc(void)
1072 1072
1073 c->device.release = &i2o_iop_release; 1073 c->device.release = &i2o_iop_release;
1074 1074
1075 snprintf(c->device.bus_id, BUS_ID_SIZE, "iop%d", c->unit); 1075 dev_set_name(&c->device, "iop%d", c->unit);
1076 1076
1077#if BITS_PER_LONG == 64 1077#if BITS_PER_LONG == 64
1078 spin_lock_init(&c->context_list_lock); 1078 spin_lock_init(&c->context_list_lock);