diff options
author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/message | |
parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/i2o/device.c | 10 | ||||
-rw-r--r-- | drivers/message/i2o/driver.c | 1 | ||||
-rw-r--r-- | drivers/message/i2o/i2o_proc.c | 2 | ||||
-rw-r--r-- | drivers/message/i2o/i2o_scsi.c | 2 | ||||
-rw-r--r-- | drivers/message/i2o/iop.c | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c index 54c2e9ae23e5..0ee4264f5db7 100644 --- a/drivers/message/i2o/device.c +++ b/drivers/message/i2o/device.c | |||
@@ -52,7 +52,6 @@ static inline int i2o_device_issue_claim(struct i2o_device *dev, u32 cmd, | |||
52 | /** | 52 | /** |
53 | * i2o_device_claim - claim a device for use by an OSM | 53 | * i2o_device_claim - claim a device for use by an OSM |
54 | * @dev: I2O device to claim | 54 | * @dev: I2O device to claim |
55 | * @drv: I2O driver which wants to claim the device | ||
56 | * | 55 | * |
57 | * Do the leg work to assign a device to a given OSM. If the claim succeeds, | 56 | * Do the leg work to assign a device to a given OSM. If the claim succeeds, |
58 | * the owner is the primary. If the attempt fails a negative errno code | 57 | * the owner is the primary. If the attempt fails a negative errno code |
@@ -80,7 +79,6 @@ int i2o_device_claim(struct i2o_device *dev) | |||
80 | /** | 79 | /** |
81 | * i2o_device_claim_release - release a device that the OSM is using | 80 | * i2o_device_claim_release - release a device that the OSM is using |
82 | * @dev: device to release | 81 | * @dev: device to release |
83 | * @drv: driver which claimed the device | ||
84 | * | 82 | * |
85 | * Drop a claim by an OSM on a given I2O device. | 83 | * Drop a claim by an OSM on a given I2O device. |
86 | * | 84 | * |
@@ -134,7 +132,7 @@ static void i2o_device_release(struct device *dev) | |||
134 | { | 132 | { |
135 | struct i2o_device *i2o_dev = to_i2o_device(dev); | 133 | struct i2o_device *i2o_dev = to_i2o_device(dev); |
136 | 134 | ||
137 | pr_debug("i2o: device %s released\n", dev->bus_id); | 135 | pr_debug("i2o: device %s released\n", dev_name(dev)); |
138 | 136 | ||
139 | kfree(i2o_dev); | 137 | kfree(i2o_dev); |
140 | } | 138 | } |
@@ -229,8 +227,8 @@ static int i2o_device_add(struct i2o_controller *c, i2o_lct_entry *entry) | |||
229 | 227 | ||
230 | i2o_dev->lct_data = *entry; | 228 | i2o_dev->lct_data = *entry; |
231 | 229 | ||
232 | snprintf(i2o_dev->device.bus_id, BUS_ID_SIZE, "%d:%03x", c->unit, | 230 | dev_set_name(&i2o_dev->device, "%d:%03x", c->unit, |
233 | i2o_dev->lct_data.tid); | 231 | i2o_dev->lct_data.tid); |
234 | 232 | ||
235 | i2o_dev->iop = c; | 233 | i2o_dev->iop = c; |
236 | i2o_dev->device.parent = &c->device; | 234 | i2o_dev->device.parent = &c->device; |
@@ -281,7 +279,7 @@ static int i2o_device_add(struct i2o_controller *c, i2o_lct_entry *entry) | |||
281 | 279 | ||
282 | i2o_driver_notify_device_add_all(i2o_dev); | 280 | i2o_driver_notify_device_add_all(i2o_dev); |
283 | 281 | ||
284 | pr_debug("i2o: device %s added\n", i2o_dev->device.bus_id); | 282 | pr_debug("i2o: device %s added\n", dev_name(&i2o_dev->device)); |
285 | 283 | ||
286 | return 0; | 284 | return 0; |
287 | 285 | ||
diff --git a/drivers/message/i2o/driver.c b/drivers/message/i2o/driver.c index e0d474b17433..a0421efe04ca 100644 --- a/drivers/message/i2o/driver.c +++ b/drivers/message/i2o/driver.c | |||
@@ -173,7 +173,6 @@ void i2o_driver_unregister(struct i2o_driver *drv) | |||
173 | * i2o_driver_dispatch - dispatch an I2O reply message | 173 | * i2o_driver_dispatch - dispatch an I2O reply message |
174 | * @c: I2O controller of the message | 174 | * @c: I2O controller of the message |
175 | * @m: I2O message number | 175 | * @m: I2O message number |
176 | * @msg: I2O message to be delivered | ||
177 | * | 176 | * |
178 | * The reply is delivered to the driver from which the original message | 177 | * The reply is delivered to the driver from which the original message |
179 | * was. This function is only called from interrupt context. | 178 | * was. This function is only called from interrupt context. |
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/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c index 1bcdbbb9e7d3..3d45817e6dcd 100644 --- a/drivers/message/i2o/i2o_scsi.c +++ b/drivers/message/i2o/i2o_scsi.c | |||
@@ -390,7 +390,7 @@ static int i2o_scsi_reply(struct i2o_controller *c, u32 m, | |||
390 | * @i2o_dev: the I2O device which was added | 390 | * @i2o_dev: the I2O device which was added |
391 | * | 391 | * |
392 | * If a I2O device is added we catch the notification, because I2O classes | 392 | * If a I2O device is added we catch the notification, because I2O classes |
393 | * other then SCSI peripheral will not be received through | 393 | * other than SCSI peripheral will not be received through |
394 | * i2o_scsi_probe(). | 394 | * i2o_scsi_probe(). |
395 | */ | 395 | */ |
396 | static void i2o_scsi_notify_device_add(struct i2o_device *i2o_dev) | 396 | static void i2o_scsi_notify_device_add(struct i2o_device *i2o_dev) |
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); |