Skip to content

Commit

Permalink
Staging: make drivers use spin_lock_init()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sven-Thorsten Dietrich authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 21b0838 commit c852ab6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/batman-adv/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/iio/ring_generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/iio/ring_sw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c852ab6

Please sign in to comment.