From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out-022.synserver.de ([212.40.185.22]:1140 "EHLO smtp-out-022.synserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750900Ab2IJIeM (ORCPT ); Mon, 10 Sep 2012 04:34:12 -0400 From: Lars-Peter Clausen To: Jonathan Cameron Cc: linux-iio@vger.kernel.org, drivers@analog.com, Lars-Peter Clausen Subject: [PATCH v2 03/10] staging:iio:ad7476: Avoid alloc/free for each sample in buffered mode Date: Mon, 10 Sep 2012 10:34:34 +0200 Message-Id: <1347266081-6045-3-git-send-email-lars@metafoo.de> In-Reply-To: <1347266081-6045-1-git-send-email-lars@metafoo.de> References: <1347266081-6045-1-git-send-email-lars@metafoo.de> Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org The ad7476 driver has only support for 1 channel ADCs. So the upper limit for the buffer size is the size of one sample plus the size of the timestamp. Preallocate a buffer large enough to hold this to avoid having to allocate and free a new buffer for each sample being captured. Signed-off-by: Lars-Peter Clausen --- Changes since v1: Use the same prepared spi message as for single transfers in the trigger handler. --- drivers/staging/iio/adc/ad7476.h | 5 ++++- drivers/staging/iio/adc/ad7476_ring.c | 14 +++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/staging/iio/adc/ad7476.h b/drivers/staging/iio/adc/ad7476.h index 6085fad..c4f1150 100644 --- a/drivers/staging/iio/adc/ad7476.h +++ b/drivers/staging/iio/adc/ad7476.h @@ -33,8 +33,11 @@ struct ad7476_state { /* * DMA (thus cache coherency maintenance) requires the * transfer buffers to live in their own cache lines. + * Make the buffer large enough for one 16 bit sample and one 64 bit + * aligned 64 bit timestamp. */ - unsigned char data[2] ____cacheline_aligned; + unsigned char data[ALIGN(2, sizeof(s64)) + sizeof(s64)] + ____cacheline_aligned; }; enum ad7476_supported_device_ids { diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c index 940681f..3c869b0 100644 --- a/drivers/staging/iio/adc/ad7476_ring.c +++ b/drivers/staging/iio/adc/ad7476_ring.c @@ -26,28 +26,20 @@ static irqreturn_t ad7476_trigger_handler(int irq, void *p) struct iio_dev *indio_dev = pf->indio_dev; struct ad7476_state *st = iio_priv(indio_dev); s64 time_ns; - __u8 *rxbuf; int b_sent; - rxbuf = kzalloc(indio_dev->scan_bytes, GFP_KERNEL); - if (rxbuf == NULL) - goto done; - - b_sent = spi_read(st->spi, rxbuf, - st->chip_info->channel[0].scan_type.storagebits / 8); + b_sent = spi_sync(st->spi, &st->msg); if (b_sent < 0) goto done; time_ns = iio_get_time_ns(); if (indio_dev->scan_timestamp) - memcpy(rxbuf + indio_dev->scan_bytes - sizeof(s64), - &time_ns, sizeof(time_ns)); + ((s64 *)st->data)[1] = time_ns; - iio_push_to_buffer(indio_dev->buffer, rxbuf); + iio_push_to_buffer(indio_dev->buffer, st->data); done: iio_trigger_notify_done(indio_dev->trig); - kfree(rxbuf); return IRQ_HANDLED; } -- 1.7.10.4