Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c852ab66 authored by Sven-Thorsten Dietrich's avatar Sven-Thorsten Dietrich Committed by Greg Kroah-Hartman
Browse files

Staging: make drivers use spin_lock_init() 



This fixes some RT-triggered compile errors and typos.

Signed-off-by: default avatarSven-Thorsten Dietrich <sdietrich@novell.com>
Acked-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 21b0838c

drivers/staging/batman-adv/device.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ int bat_device_open(struct inode *inode, struct file *file) 
	INIT_LIST_HEAD(&device_client->queue_list);

	INIT_LIST_HEAD(&device_client->queue_list);

	device_client->queue_len = 0;

	device_client->queue_len = 0;

	device_client->index = i;

	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);

	init_waitqueue_head(&device_client->queue_wait);





	file->private_data = device_client;

	file->private_data = device_client;

drivers/staging/iio/ring_generic.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -146,8 +146,7 @@ static inline void __iio_init_ring_buffer(struct iio_ring_buffer *ring, 
	ring->length = length;

	ring->length = length;

	ring->loopcount = 0;

	ring->loopcount = 0;

	ring->shared_ev_pointer.ev_p = 0;

	ring->shared_ev_pointer.ev_p = 0;

	ring->shared_ev_pointer.lock =

	spin_lock_init(&ring->shared_ev_pointer.lock);

		__SPIN_LOCK_UNLOCKED(ring->shared_ev_pointer->loc);

}

}





/**

/**

drivers/staging/iio/ring_sw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ static inline int __iio_init_sw_ring_buffer(struct iio_sw_ring_buffer *ring, 
		return -EINVAL;

		return -EINVAL;





	__iio_init_ring_buffer(&ring->buf, bytes_per_datum, length);

	__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->data = kmalloc(length*ring->buf.bpd, GFP_KERNEL);

	ring->read_p = 0;

	ring->read_p = 0;

	ring->write_p = 0;

	ring->write_p = 0;