From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: lars@metafoo.de, Jonathan Cameron <jic23@kernel.org>
Subject: [PATCH 08/14] staging:iio:adc:ad7793 use iio_sw_buffer_preenable to avoid repitition.
Date: Wed, 18 Apr 2012 14:13:48 +0100 [thread overview]
Message-ID: <1334754834-13622-9-git-send-email-jic23@kernel.org> (raw)
In-Reply-To: <1334754834-13622-1-git-send-email-jic23@kernel.org>
Now the generic function caches the scan size a lot of what was here
was redundant and is removed.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/staging/iio/adc/ad7793.c | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 9d21e39..2aeeaa2 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -319,31 +319,18 @@ out:
static int ad7793_ring_preenable(struct iio_dev *indio_dev)
{
struct ad7793_state *st = iio_priv(indio_dev);
- struct iio_buffer *ring = indio_dev->buffer;
- size_t d_size;
unsigned channel;
+ int ret;
if (bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
return -EINVAL;
+ ret = iio_sw_buffer_preenable(indio_dev);
+ if (ret < 0)
+ return ret;
channel = find_first_bit(indio_dev->active_scan_mask,
indio_dev->masklength);
- d_size = bitmap_weight(indio_dev->active_scan_mask,
- indio_dev->masklength) *
- indio_dev->channels[0].scan_type.storagebits / 8;
-
- if (ring->scan_timestamp) {
- d_size += sizeof(s64);
-
- if (d_size % sizeof(s64))
- d_size += sizeof(s64) - (d_size % sizeof(s64));
- }
-
- if (indio_dev->buffer->access->set_bytes_per_datum)
- indio_dev->buffer->access->
- set_bytes_per_datum(indio_dev->buffer, d_size);
-
st->mode = (st->mode & ~AD7793_MODE_SEL(-1)) |
AD7793_MODE_SEL(AD7793_MODE_CONT);
st->conf = (st->conf & ~AD7793_CONF_CHAN(-1)) |
--
1.7.0.4
next prev parent reply other threads:[~2012-04-18 13:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-18 13:13 [PATCH 00/14] Staging:iio: Cleanup and refactor pre multibuffer Jonathan Cameron
2012-04-18 13:13 ` [PATCH 01/14] staging:iio:buffer trivial use of strtobool to remove dodgy equivalent Jonathan Cameron
2012-04-18 13:13 ` [PATCH 02/14] staging:iio:buffer: pull computation of scan length into a utility function Jonathan Cameron
2012-04-18 13:13 ` [PATCH 03/14] staging:iio: scan_index_timestamp move to iio_dev from buffer Jonathan Cameron
2012-04-18 13:13 ` [PATCH 04/14] staging:iio: add caching of the number of bytes in a scan Jonathan Cameron
[not found] ` <4F91944F.3070701@metafoo.de>
2012-04-20 17:02 ` Jonathan Cameron
2012-04-18 13:13 ` [PATCH 05/14] staging:iio:adc:ad7192 make use of iio_sw_buffer_preenable Jonathan Cameron
2012-04-18 13:13 ` [PATCH 06/14] staging:iio:adc:ad7298 use iio_sw_buffer_preenable to avoid code repitition Jonathan Cameron
2012-04-18 13:13 ` [PATCH 07/14] staging:iio:adc:ad7476 use iio_sw_buffer_preenable instead of local version Jonathan Cameron
2012-04-18 13:13 ` Jonathan Cameron [this message]
2012-04-18 13:13 ` [PATCH 09/14] staging:iio:adc:ad7887 make use of iio_sw_buffer_preenable Jonathan Cameron
2012-04-18 13:13 ` [PATCH 10/14] staging:iio:adc:ad799x use iio_sw_buffer_preenable to avoid code repitiion Jonathan Cameron
2012-04-18 13:13 ` [PATCH 11/14] staging:iio:meter:ad7758 use iio_sw_buffer_preenable to avoid code repition Jonathan Cameron
2012-04-18 13:13 ` [PATCH 12/14] staging:iio:impedance-analyser make use of iio_sw_buffer_preenable Jonathan Cameron
2012-04-18 13:13 ` [PATCH 13/14] staging:iio: Add caching of scan_timestamp to the core as well as buffers Jonathan Cameron
2012-04-18 13:13 ` [PATCH 14/14] staging:iio: pull out demux cleanup for a particular buffer Jonathan Cameron
[not found] ` <4F919648.2070503@metafoo.de>
2012-04-21 9:10 ` [PATCH 00/14] Staging:iio: Cleanup and refactor pre multibuffer Jonathan Cameron
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=1334754834-13622-9-git-send-email-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
/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).