diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /include/linux/i2o.h | |
parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'include/linux/i2o.h')
-rw-r--r-- | include/linux/i2o.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/include/linux/i2o.h b/include/linux/i2o.h index c115e9e840b4..52f53e2e70c3 100644 --- a/include/linux/i2o.h +++ b/include/linux/i2o.h | |||
@@ -461,7 +461,7 @@ struct i2o_driver { | |||
461 | int (*reply) (struct i2o_controller *, u32, struct i2o_message *); | 461 | int (*reply) (struct i2o_controller *, u32, struct i2o_message *); |
462 | 462 | ||
463 | /* Event handler */ | 463 | /* Event handler */ |
464 | void (*event) (struct i2o_event *); | 464 | work_func_t event; |
465 | 465 | ||
466 | struct workqueue_struct *event_queue; /* Event queue */ | 466 | struct workqueue_struct *event_queue; /* Event queue */ |
467 | 467 | ||
@@ -490,7 +490,7 @@ struct i2o_dma { | |||
490 | */ | 490 | */ |
491 | struct i2o_pool { | 491 | struct i2o_pool { |
492 | char *name; | 492 | char *name; |
493 | kmem_cache_t *slab; | 493 | struct kmem_cache *slab; |
494 | mempool_t *mempool; | 494 | mempool_t *mempool; |
495 | }; | 495 | }; |
496 | 496 | ||
@@ -986,7 +986,8 @@ extern void i2o_driver_unregister(struct i2o_driver *); | |||
986 | 986 | ||
987 | /** | 987 | /** |
988 | * i2o_driver_notify_controller_add - Send notification of added controller | 988 | * i2o_driver_notify_controller_add - Send notification of added controller |
989 | * to a single I2O driver | 989 | * @drv: I2O driver |
990 | * @c: I2O controller | ||
990 | * | 991 | * |
991 | * Send notification of added controller to a single registered driver. | 992 | * Send notification of added controller to a single registered driver. |
992 | */ | 993 | */ |
@@ -998,8 +999,9 @@ static inline void i2o_driver_notify_controller_add(struct i2o_driver *drv, | |||
998 | }; | 999 | }; |
999 | 1000 | ||
1000 | /** | 1001 | /** |
1001 | * i2o_driver_notify_controller_remove - Send notification of removed | 1002 | * i2o_driver_notify_controller_remove - Send notification of removed controller |
1002 | * controller to a single I2O driver | 1003 | * @drv: I2O driver |
1004 | * @c: I2O controller | ||
1003 | * | 1005 | * |
1004 | * Send notification of removed controller to a single registered driver. | 1006 | * Send notification of removed controller to a single registered driver. |
1005 | */ | 1007 | */ |
@@ -1011,8 +1013,9 @@ static inline void i2o_driver_notify_controller_remove(struct i2o_driver *drv, | |||
1011 | }; | 1013 | }; |
1012 | 1014 | ||
1013 | /** | 1015 | /** |
1014 | * i2o_driver_notify_device_add - Send notification of added device to a | 1016 | * i2o_driver_notify_device_add - Send notification of added device |
1015 | * single I2O driver | 1017 | * @drv: I2O driver |
1018 | * @i2o_dev: the added i2o_device | ||
1016 | * | 1019 | * |
1017 | * Send notification of added device to a single registered driver. | 1020 | * Send notification of added device to a single registered driver. |
1018 | */ | 1021 | */ |
@@ -1025,7 +1028,8 @@ static inline void i2o_driver_notify_device_add(struct i2o_driver *drv, | |||
1025 | 1028 | ||
1026 | /** | 1029 | /** |
1027 | * i2o_driver_notify_device_remove - Send notification of removed device | 1030 | * i2o_driver_notify_device_remove - Send notification of removed device |
1028 | * to a single I2O driver | 1031 | * @drv: I2O driver |
1032 | * @i2o_dev: the added i2o_device | ||
1029 | * | 1033 | * |
1030 | * Send notification of removed device to a single registered driver. | 1034 | * Send notification of removed device to a single registered driver. |
1031 | */ | 1035 | */ |
@@ -1148,7 +1152,7 @@ static inline void i2o_msg_post(struct i2o_controller *c, | |||
1148 | /** | 1152 | /** |
1149 | * i2o_msg_post_wait - Post and wait a message and wait until return | 1153 | * i2o_msg_post_wait - Post and wait a message and wait until return |
1150 | * @c: controller | 1154 | * @c: controller |
1151 | * @m: message to post | 1155 | * @msg: message to post |
1152 | * @timeout: time in seconds to wait | 1156 | * @timeout: time in seconds to wait |
1153 | * | 1157 | * |
1154 | * This API allows an OSM to post a message and then be told whether or | 1158 | * This API allows an OSM to post a message and then be told whether or |