aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/i2o/iop.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/message/i2o/iop.c')
-rw-r--r--drivers/message/i2o/iop.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 27cf4af0e13d..090d2a3a6548 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -29,6 +29,7 @@
29#include <linux/i2o.h> 29#include <linux/i2o.h>
30#include <linux/delay.h> 30#include <linux/delay.h>
31#include <linux/sched.h> 31#include <linux/sched.h>
32#include <linux/slab.h>
32#include "core.h" 33#include "core.h"
33 34
34#define OSM_NAME "i2o" 35#define OSM_NAME "i2o"
@@ -132,7 +133,7 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
132 * Removes a previously added pointer from the context list and returns 133 * Removes a previously added pointer from the context list and returns
133 * the matching context id. 134 * the matching context id.
134 * 135 *
135 * Returns context id on succes or 0 on failure. 136 * Returns context id on success or 0 on failure.
136 */ 137 */
137u32 i2o_cntxt_list_remove(struct i2o_controller * c, void *ptr) 138u32 i2o_cntxt_list_remove(struct i2o_controller * c, void *ptr)
138{ 139{
@@ -198,7 +199,7 @@ void *i2o_cntxt_list_get(struct i2o_controller *c, u32 context)
198 * @c: controller to which the context list belong 199 * @c: controller to which the context list belong
199 * @ptr: pointer to which the context id should be fetched 200 * @ptr: pointer to which the context id should be fetched
200 * 201 *
201 * Returns context id which matches to the pointer on succes or 0 on 202 * Returns context id which matches to the pointer on success or 0 on
202 * failure. 203 * failure.
203 */ 204 */
204u32 i2o_cntxt_list_get_ptr(struct i2o_controller * c, void *ptr) 205u32 i2o_cntxt_list_get_ptr(struct i2o_controller * c, void *ptr)
@@ -539,7 +540,7 @@ static int i2o_iop_reset(struct i2o_controller *c)
539 * which is indeterminate. We need to wait until the IOP has 540 * which is indeterminate. We need to wait until the IOP has
540 * rebooted before we can let the system talk to it. We read 541 * rebooted before we can let the system talk to it. We read
541 * the inbound Free_List until a message is available. If we 542 * the inbound Free_List until a message is available. If we
542 * can't read one in the given ammount of time, we assume the 543 * can't read one in the given amount of time, we assume the
543 * IOP could not reboot properly. 544 * IOP could not reboot properly.
544 */ 545 */
545 osm_debug("%s: Reset in progress, waiting for reboot...\n", 546 osm_debug("%s: Reset in progress, waiting for reboot...\n",