aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/i2o/device.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/message/i2o/device.c')
-rw-r--r--drivers/message/i2o/device.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index 34976b26b265..ee183053fa23 100644
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -43,7 +43,7 @@ static inline int i2o_device_issue_claim(struct i2o_device *dev, u32 cmd,
43 43
44 msg->u.head[0] = cpu_to_le32(FIVE_WORD_MSG_SIZE | SGL_OFFSET_0); 44 msg->u.head[0] = cpu_to_le32(FIVE_WORD_MSG_SIZE | SGL_OFFSET_0);
45 msg->u.head[1] = 45 msg->u.head[1] =
46 cpu_to_le32(cmd << 24 | HOST_TID << 12 | dev->lct_data.tid); 46 cpu_to_le32(cmd << 24 | HOST_TID << 12 | dev->lct_data.tid);
47 msg->body[0] = cpu_to_le32(type); 47 msg->body[0] = cpu_to_le32(type);
48 48
49 return i2o_msg_post_wait(dev->iop, msg, 60); 49 return i2o_msg_post_wait(dev->iop, msg, 60);
@@ -123,7 +123,6 @@ int i2o_device_claim_release(struct i2o_device *dev)
123 return rc; 123 return rc;
124} 124}
125 125
126
127/** 126/**
128 * i2o_device_release - release the memory for a I2O device 127 * i2o_device_release - release the memory for a I2O device
129 * @dev: I2O device which should be released 128 * @dev: I2O device which should be released
@@ -140,7 +139,6 @@ static void i2o_device_release(struct device *dev)
140 kfree(i2o_dev); 139 kfree(i2o_dev);
141} 140}
142 141
143
144/** 142/**
145 * i2o_device_show_class_id - Displays class id of I2O device 143 * i2o_device_show_class_id - Displays class id of I2O device
146 * @dev: device of which the class id should be displayed 144 * @dev: device of which the class id should be displayed
@@ -250,10 +248,10 @@ static struct i2o_device *i2o_device_add(struct i2o_controller *c,
250 248
251 /* create user entries refering to this device */ 249 /* create user entries refering to this device */
252 list_for_each_entry(tmp, &c->devices, list) 250 list_for_each_entry(tmp, &c->devices, list)
253 if ((tmp->lct_data.user_tid == i2o_dev->lct_data.tid) 251 if ((tmp->lct_data.user_tid == i2o_dev->lct_data.tid)
254 && (tmp != i2o_dev)) 252 && (tmp != i2o_dev))
255 sysfs_create_link(&tmp->device.kobj, 253 sysfs_create_link(&tmp->device.kobj,
256 &i2o_dev->device.kobj, "user"); 254 &i2o_dev->device.kobj, "user");
257 255
258 /* create parent entries for this device */ 256 /* create parent entries for this device */
259 tmp = i2o_iop_find_device(i2o_dev->iop, i2o_dev->lct_data.parent_tid); 257 tmp = i2o_iop_find_device(i2o_dev->iop, i2o_dev->lct_data.parent_tid);
@@ -263,10 +261,10 @@ static struct i2o_device *i2o_device_add(struct i2o_controller *c,
263 261
264 /* create parent entries refering to this device */ 262 /* create parent entries refering to this device */
265 list_for_each_entry(tmp, &c->devices, list) 263 list_for_each_entry(tmp, &c->devices, list)
266 if ((tmp->lct_data.parent_tid == i2o_dev->lct_data.tid) 264 if ((tmp->lct_data.parent_tid == i2o_dev->lct_data.tid)
267 && (tmp != i2o_dev)) 265 && (tmp != i2o_dev))
268 sysfs_create_link(&tmp->device.kobj, 266 sysfs_create_link(&tmp->device.kobj,
269 &i2o_dev->device.kobj, "parent"); 267 &i2o_dev->device.kobj, "parent");
270 268
271 i2o_driver_notify_device_add_all(i2o_dev); 269 i2o_driver_notify_device_add_all(i2o_dev);
272 270
@@ -410,7 +408,6 @@ int i2o_device_parse_lct(struct i2o_controller *c)
410 return 0; 408 return 0;
411} 409}
412 410
413
414/* 411/*
415 * Run time support routines 412 * Run time support routines
416 */ 413 */