Staging: make drivers use spin_lock_init()

This fixes some RT-triggered compile errors and typos.

Signed-off-by: Sven-Thorsten Dietrich <sdietrich@novell.com>
Acked-by: Marek Lindner <lindner_marek@yahoo.de>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/batman-adv/device.c b/drivers/staging/batman-adv/device.c
index 451898cd9ecb1fa765184248ce054abe8bc11d50..e7f44215b5f383834b865b0791737f55e5838991 100644 (file)
--- a/drivers/staging/batman-adv/device.c
+++ b/drivers/staging/batman-adv/device.c
@@ -118,7 +118,7 @@ int bat_device_open(struct inode *inode, struct file *file)
        INIT_LIST_HEAD(&device_client->queue_list);
        device_client->queue_len = 0;
        device_client->index = i;
-       device_client->lock = __SPIN_LOCK_UNLOCKED(device_client->lock);
+       spin_lock_init(&device_client->lock);
        init_waitqueue_head(&device_client->queue_wait);
 
        file->private_data = device_client;

diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h
index 93b91b28a02f478ef4fc11b026c4cb36d357a15e..09044adf732706806c7b6a808bb9f23d0ba310ec 100644 (file)
--- a/drivers/staging/iio/ring_generic.h
+++ b/drivers/staging/iio/ring_generic.h
@@ -146,8 +146,7 @@ static inline void __iio_init_ring_buffer(struct iio_ring_buffer *ring,
        ring->length = length;
        ring->loopcount = 0;
        ring->shared_ev_pointer.ev_p = 0;
-       ring->shared_ev_pointer.lock =
-               __SPIN_LOCK_UNLOCKED(ring->shared_ev_pointer->loc);
+       spin_lock_init(&ring->shared_ev_pointer.lock);
 }
 
 /**

diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index b746cf6032256961282a7026eff869798fde84c4..6f7f4d5a93f3ef83aea226fa2ca6bb51d2383ead 100644 (file)
--- a/drivers/staging/iio/ring_sw.c
+++ b/drivers/staging/iio/ring_sw.c
@@ -20,7 +20,7 @@ static inline int __iio_init_sw_ring_buffer(struct iio_sw_ring_buffer *ring,
                return -EINVAL;
 
        __iio_init_ring_buffer(&ring->buf, bytes_per_datum, length);
-       ring->use_lock = __SPIN_LOCK_UNLOCKED((ring)->use_lock);
+       spin_lock_init(&ring->use_lock);
        ring->data = kmalloc(length*ring->buf.bpd, GFP_KERNEL);
        ring->read_p = 0;
        ring->write_p = 0;