git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
i2o.h
diff --git
a/include/linux/i2o.h
b/include/linux/i2o.h
index
6368e31
..
52f53e2
100644
(file)
--- a/
include/linux/i2o.h
+++ b/
include/linux/i2o.h
@@
-461,7
+461,7
@@
struct i2o_driver {
int (*reply) (struct i2o_controller *, u32, struct i2o_message *);
/* Event handler */
int (*reply) (struct i2o_controller *, u32, struct i2o_message *);
/* Event handler */
-
void (*event) (struct i2o_event *)
;
+
work_func_t event
;
struct workqueue_struct *event_queue; /* Event queue */
struct workqueue_struct *event_queue; /* Event queue */
@@
-490,7
+490,7
@@
struct i2o_dma {
*/
struct i2o_pool {
char *name;
*/
struct i2o_pool {
char *name;
-
kmem_cache_t
*slab;
+
struct kmem_cache
*slab;
mempool_t *mempool;
};
mempool_t *mempool;
};
@@
-950,9
+950,7
@@
static inline int i2o_pool_alloc(struct i2o_pool *pool, const char *name,
if (!pool->slab)
goto free_name;
if (!pool->slab)
goto free_name;
- pool->mempool =
- mempool_create(min_nr, mempool_alloc_slab, mempool_free_slab,
- pool->slab);
+ pool->mempool = mempool_create_slab_pool(min_nr, pool->slab);
if (!pool->mempool)
goto free_slab;
if (!pool->mempool)
goto free_slab;
@@
-988,7
+986,8
@@
extern void i2o_driver_unregister(struct i2o_driver *);
/**
* i2o_driver_notify_controller_add - Send notification of added controller
/**
* i2o_driver_notify_controller_add - Send notification of added controller
- * to a single I2O driver
+ * @drv: I2O driver
+ * @c: I2O controller
*
* Send notification of added controller to a single registered driver.
*/
*
* Send notification of added controller to a single registered driver.
*/
@@
-1000,8
+999,9
@@
static inline void i2o_driver_notify_controller_add(struct i2o_driver *drv,
};
/**
};
/**
- * i2o_driver_notify_controller_remove - Send notification of removed
- * controller to a single I2O driver
+ * i2o_driver_notify_controller_remove - Send notification of removed controller
+ * @drv: I2O driver
+ * @c: I2O controller
*
* Send notification of removed controller to a single registered driver.
*/
*
* Send notification of removed controller to a single registered driver.
*/
@@
-1013,8
+1013,9
@@
static inline void i2o_driver_notify_controller_remove(struct i2o_driver *drv,
};
/**
};
/**
- * i2o_driver_notify_device_add - Send notification of added device to a
- * single I2O driver
+ * i2o_driver_notify_device_add - Send notification of added device
+ * @drv: I2O driver
+ * @i2o_dev: the added i2o_device
*
* Send notification of added device to a single registered driver.
*/
*
* Send notification of added device to a single registered driver.
*/
@@
-1027,7
+1028,8
@@
static inline void i2o_driver_notify_device_add(struct i2o_driver *drv,
/**
* i2o_driver_notify_device_remove - Send notification of removed device
/**
* i2o_driver_notify_device_remove - Send notification of removed device
- * to a single I2O driver
+ * @drv: I2O driver
+ * @i2o_dev: the added i2o_device
*
* Send notification of removed device to a single registered driver.
*/
*
* Send notification of removed device to a single registered driver.
*/
@@
-1150,7
+1152,7
@@
static inline void i2o_msg_post(struct i2o_controller *c,
/**
* i2o_msg_post_wait - Post and wait a message and wait until return
* @c: controller
/**
* i2o_msg_post_wait - Post and wait a message and wait until return
* @c: controller
- * @m: message to post
+ * @m
sg
: message to post
* @timeout: time in seconds to wait
*
* This API allows an OSM to post a message and then be told whether or
* @timeout: time in seconds to wait
*
* This API allows an OSM to post a message and then be told whether or