From: "J.I. Cameron" <jic23@cam.ac.uk>
To: Sven-Thorsten Dietrich <sdietrich@novell.com>
Cc: Greg KH <gregkh@suse.de>,
lindner_marek@yahoo.de, siwu@hrz.tu-chemnitz.de,
linux-iio@vger.kernel.org
Subject: Re: [PATCH] staging drivers use spin_lock_init()
Date: 23 Feb 2010 22:54:20 +0000 [thread overview]
Message-ID: <Prayer.1.3.2.1002232254200.5956@hermes-2.csi.cam.ac.uk> (raw)
In-Reply-To: <1266962359.3234.40.camel@sven.thebigcorporation.com>
On Feb 23 2010, Sven-Thorsten Dietrich wrote:
>Subject: Convert driver-staging to use spin_lock_init()
>
>This fixes some RT-triggered compile errors and typos.
>
>Against 2.6.33-rc8. Push upstream as you see appropriate.
>
>Thanks.
>
>Signed-off-by: Sven-Thorsten Dietrich <sdietrich@novell.com>
For the two IIO patches,
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Thanks for the fix!
Jonathan
>Index: linux-2.6.32-slert-devel/drivers/staging/batman-adv/device.c
>===================================================================
>--- linux-2.6.32-slert-devel.orig/drivers/staging/batman-adv/device.c
>+++ linux-2.6.32-slert-devel/drivers/staging/batman-adv/device.c
>@@ -118,9 +118,9 @@ int bat_device_open(struct inode *inode,
>
> 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;
>
>Index: linux-2.6.32-slert-devel/drivers/staging/iio/ring_generic.h
>===================================================================
>--- linux-2.6.32-slert-devel.orig/drivers/staging/iio/ring_generic.h
>+++ linux-2.6.32-slert-devel/drivers/staging/iio/ring_generic.h
>@@ -145,10 +145,9 @@ static inline void __iio_init_ring_buffe
> ring->bpd = bytes_per_datum;
> 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);
> }
>
> /**
> * struct iio_scan_el - an individual element of a scan diff -u -r
> linux-2.6.32.orig/drivers/staging/iio/ring_sw.c
> linux-2.6.32.orig-bak/drivers/staging/iio/ring_sw.c ---
> linux-2.6.32.orig/drivers/staging/iio/ring_sw.c 2009-12-02
> 19:51:21.000000000 -0800 +++
> linux-2.6.32.orig-bak/drivers/staging/iio/ring_sw.c 2010-02-22
> 19:04:42.171671961 -0800 @@ -21,7 +21,7 @@
> 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;
>
>
>
parent reply other threads:[~2010-02-23 22:54 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <1266962359.3234.40.camel@sven.thebigcorporation.com>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Prayer.1.3.2.1002232254200.5956@hermes-2.csi.cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=gregkh@suse.de \
--cc=lindner_marek@yahoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=sdietrich@novell.com \
--cc=siwu@hrz.tu-chemnitz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).