diff options
-rw-r--r-- | drivers/message/i2o/device.c | 21 | ||||
-rw-r--r-- | drivers/message/i2o/exec-osm.c | 2 | ||||
-rw-r--r-- | drivers/message/i2o/i2o_lan.h | 38 |
3 files changed, 29 insertions, 32 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 | */ |
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c index d418ad35dcd0..9bb9859f6dfe 100644 --- a/drivers/message/i2o/exec-osm.c +++ b/drivers/message/i2o/exec-osm.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <linux/workqueue.h> | 33 | #include <linux/workqueue.h> |
34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
36 | #include <linux/sched.h> /* wait_event_interruptible_timeout() needs this */ | 36 | #include <linux/sched.h> /* wait_event_interruptible_timeout() needs this */ |
37 | #include <asm/param.h> /* HZ */ | 37 | #include <asm/param.h> /* HZ */ |
38 | #include "core.h" | 38 | #include "core.h" |
39 | 39 | ||
diff --git a/drivers/message/i2o/i2o_lan.h b/drivers/message/i2o/i2o_lan.h index 561d63304d7e..6502b817df58 100644 --- a/drivers/message/i2o/i2o_lan.h +++ b/drivers/message/i2o/i2o_lan.h | |||
@@ -103,14 +103,14 @@ | |||
103 | #define I2O_LAN_DSC_SUSPENDED 0x11 | 103 | #define I2O_LAN_DSC_SUSPENDED 0x11 |
104 | 104 | ||
105 | struct i2o_packet_info { | 105 | struct i2o_packet_info { |
106 | u32 offset : 24; | 106 | u32 offset:24; |
107 | u32 flags : 8; | 107 | u32 flags:8; |
108 | u32 len : 24; | 108 | u32 len:24; |
109 | u32 status : 8; | 109 | u32 status:8; |
110 | }; | 110 | }; |
111 | 111 | ||
112 | struct i2o_bucket_descriptor { | 112 | struct i2o_bucket_descriptor { |
113 | u32 context; /* FIXME: 64bit support */ | 113 | u32 context; /* FIXME: 64bit support */ |
114 | struct i2o_packet_info packet_info[1]; | 114 | struct i2o_packet_info packet_info[1]; |
115 | }; | 115 | }; |
116 | 116 | ||
@@ -127,14 +127,14 @@ struct i2o_lan_local { | |||
127 | u8 unit; | 127 | u8 unit; |
128 | struct i2o_device *i2o_dev; | 128 | struct i2o_device *i2o_dev; |
129 | 129 | ||
130 | struct fddi_statistics stats; /* see also struct net_device_stats */ | 130 | struct fddi_statistics stats; /* see also struct net_device_stats */ |
131 | unsigned short (*type_trans)(struct sk_buff *, struct net_device *); | 131 | unsigned short (*type_trans) (struct sk_buff *, struct net_device *); |
132 | atomic_t buckets_out; /* nbr of unused buckets on DDM */ | 132 | atomic_t buckets_out; /* nbr of unused buckets on DDM */ |
133 | atomic_t tx_out; /* outstanding TXes */ | 133 | atomic_t tx_out; /* outstanding TXes */ |
134 | u8 tx_count; /* packets in one TX message frame */ | 134 | u8 tx_count; /* packets in one TX message frame */ |
135 | u16 tx_max_out; /* DDM's Tx queue len */ | 135 | u16 tx_max_out; /* DDM's Tx queue len */ |
136 | u8 sgl_max; /* max SGLs in one message frame */ | 136 | u8 sgl_max; /* max SGLs in one message frame */ |
137 | u32 m; /* IOP address of the batch msg frame */ | 137 | u32 m; /* IOP address of the batch msg frame */ |
138 | 138 | ||
139 | struct work_struct i2o_batch_send_task; | 139 | struct work_struct i2o_batch_send_task; |
140 | int send_active; | 140 | int send_active; |
@@ -144,16 +144,16 @@ struct i2o_lan_local { | |||
144 | 144 | ||
145 | spinlock_t tx_lock; | 145 | spinlock_t tx_lock; |
146 | 146 | ||
147 | u32 max_size_mc_table; /* max number of multicast addresses */ | 147 | u32 max_size_mc_table; /* max number of multicast addresses */ |
148 | 148 | ||
149 | /* LAN OSM configurable parameters are here: */ | 149 | /* LAN OSM configurable parameters are here: */ |
150 | 150 | ||
151 | u16 max_buckets_out; /* max nbr of buckets to send to DDM */ | 151 | u16 max_buckets_out; /* max nbr of buckets to send to DDM */ |
152 | u16 bucket_thresh; /* send more when this many used */ | 152 | u16 bucket_thresh; /* send more when this many used */ |
153 | u16 rx_copybreak; | 153 | u16 rx_copybreak; |
154 | 154 | ||
155 | u8 tx_batch_mode; /* Set when using batch mode sends */ | 155 | u8 tx_batch_mode; /* Set when using batch mode sends */ |
156 | u32 i2o_event_mask; /* To turn on interesting event flags */ | 156 | u32 i2o_event_mask; /* To turn on interesting event flags */ |
157 | }; | 157 | }; |
158 | 158 | ||
159 | #endif /* _I2O_LAN_H */ | 159 | #endif /* _I2O_LAN_H */ |