diff options
author | Sven-Thorsten Dietrich <sdietrich@novell.com> | 2010-02-23 16:59:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:43:04 -0500 |
commit | c852ab66727558e7fb9c994a12ff30cc3d0e2448 (patch) | |
tree | c66b4d0052107e1aca4737f055a4331da37257a0 /drivers/staging/iio | |
parent | 21b0838c1a03686277e0cfeda42015e4538b9ea3 (diff) |
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>
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r-- | drivers/staging/iio/ring_generic.h | 3 | ||||
-rw-r--r-- | drivers/staging/iio/ring_sw.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index 93b91b28a02..09044adf732 100644 --- 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, | |||
146 | ring->length = length; | 146 | ring->length = length; |
147 | ring->loopcount = 0; | 147 | ring->loopcount = 0; |
148 | ring->shared_ev_pointer.ev_p = 0; | 148 | ring->shared_ev_pointer.ev_p = 0; |
149 | ring->shared_ev_pointer.lock = | 149 | spin_lock_init(&ring->shared_ev_pointer.lock); |
150 | __SPIN_LOCK_UNLOCKED(ring->shared_ev_pointer->loc); | ||
151 | } | 150 | } |
152 | 151 | ||
153 | /** | 152 | /** |
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c index b746cf60322..6f7f4d5a93f 100644 --- 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, | |||
20 | return -EINVAL; | 20 | return -EINVAL; |
21 | 21 | ||
22 | __iio_init_ring_buffer(&ring->buf, bytes_per_datum, length); | 22 | __iio_init_ring_buffer(&ring->buf, bytes_per_datum, length); |
23 | ring->use_lock = __SPIN_LOCK_UNLOCKED((ring)->use_lock); | 23 | spin_lock_init(&ring->use_lock); |
24 | ring->data = kmalloc(length*ring->buf.bpd, GFP_KERNEL); | 24 | ring->data = kmalloc(length*ring->buf.bpd, GFP_KERNEL); |
25 | ring->read_p = 0; | 25 | ring->read_p = 0; |
26 | ring->write_p = 0; | 26 | ring->write_p = 0; |