[PATCH] i2o: converted SPIN_LOCK_UNLOCKED into spin_lock_init()

- changed initialization of spin locks from SPIN_LOCK_UNLOCKED into
  spin_lock_init()
Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/message/i2o/driver.c

@@ -24,7 +24,7 @@ module_param_named(max_drivers, i2o_max_drivers, uint, 0);
 MODULE_PARM_DESC(max_drivers, "maximum number of OSM's to support");
 
 /* I2O drivers lock and array */
-static spinlock_t i2o_drivers_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t i2o_drivers_lock;
 static struct i2o_driver **i2o_drivers;
 
 /**
@@ -327,6 +327,8 @@ int __init i2o_driver_init(void)
 {
 	int rc = 0;
 
+	spin_lock_init(&i2o_drivers_lock);
+
 	if ((i2o_max_drivers < 2) || (i2o_max_drivers > 64) ||
 	    ((i2o_max_drivers ^ (i2o_max_drivers - 1)) !=
 	     (2 * i2o_max_drivers - 1))) {

drivers/message/i2o/exec-osm.c

@@ -202,10 +202,12 @@ static int i2o_msg_post_wait_complete(struct i2o_controller *c, u32 m,
 				      struct i2o_message *msg)
 {
 	struct i2o_exec_wait *wait, *tmp;
-	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
+	static spinlock_t lock;
 	int rc = 1;
 	u32 context;
 
+	spin_lock_init(&lock);
+
 	context = readl(&msg->u.s.tcntxt);
 
 	/*

drivers/message/i2o/i2o_config.c

@@ -50,7 +50,7 @@
 
 extern int i2o_parm_issue(struct i2o_device *, int, void *, int, void *, int);
 
-static spinlock_t i2o_config_lock = SPIN_LOCK_UNLOCKED;
+static spinlock_t i2o_config_lock;
 
 #define MODINC(x,y) ((x) = ((x) + 1) % (y))
 
@@ -1128,6 +1128,8 @@ static int __init i2o_config_init(void)
 	printk(KERN_INFO "I2O configuration manager v 0.04.\n");
 	printk(KERN_INFO "  (C) Copyright 1999 Red Hat Software\n");
 
+	spin_lock_init(&i2o_config_lock);
+
 	if (misc_register(&i2o_miscdev) < 0) {
 		printk(KERN_ERR "i2o_config: can't register device.\n");
 		return -EBUSY;

drivers/message/i2o/iop.c

@@ -1121,13 +1121,13 @@ struct i2o_controller *i2o_iop_alloc(void)
 	memset(c, 0, sizeof(*c));
 
 	INIT_LIST_HEAD(&c->devices);
-	c->lock = SPIN_LOCK_UNLOCKED;
+	spin_lock_init(&c->lock);
 	init_MUTEX(&c->lct_lock);
 	c->unit = unit++;
 	sprintf(c->name, "iop%d", c->unit);
 
 #if BITS_PER_LONG == 64
-	c->context_list_lock = SPIN_LOCK_UNLOCKED;
+	spin_lock_init(&c->context_list_lock);
 	atomic_set(&c->context_list_counter, 0);
 	INIT_LIST_HEAD(&c->context_list);
 #endif