From 981d9d09a0c368ac53f3c4d4e507d28c59c4c85a Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sat, 21 Apr 2012 10:09:42 +0100 Subject: [PATCH] --- yaml --- r: 304435 b: refs/heads/master c: c562ccbf584f8017a153bbd5c1039a189e1f8be8 h: refs/heads/master i: 304433: bf1e5b8e5c4f5e977861060ef2ec54388bc35fca 304431: 0d841274fdc0f030233b2511eed7b7e324e4cbf3 v: v3 --- [refs] | 2 +- .../drivers/staging/iio/meter/ade7758_ring.c | 20 +++++-------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 6a0e2032e240..eb4f8ff41287 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1633187829aa11a475ab6e453f05d3f6a172aff +refs/heads/master: c562ccbf584f8017a153bbd5c1039a189e1f8be8 diff --git a/trunk/drivers/staging/iio/meter/ade7758_ring.c b/trunk/drivers/staging/iio/meter/ade7758_ring.c index c45b23bb1229..3dfd788c10a1 100644 --- a/trunk/drivers/staging/iio/meter/ade7758_ring.c +++ b/trunk/drivers/staging/iio/meter/ade7758_ring.c @@ -92,29 +92,19 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) static int ade7758_ring_preenable(struct iio_dev *indio_dev) { struct ade7758_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 = st->ade7758_ring_channels[channel].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); - ade7758_write_waveform_type(&indio_dev->dev, st->ade7758_ring_channels[channel].address);