From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org, greg@kroah.com
Cc: lars@metafoo.de, Jonathan Cameron <jic23@kernel.org>
Subject: [PATCH 12/19] staging:iio:adc:ad7887 stop reading from buffer for sysfs access.
Date: Mon, 5 Dec 2011 22:18:23 +0000 [thread overview]
Message-ID: <1323123510-21388-13-git-send-email-jic23@kernel.org> (raw)
In-Reply-To: <1323123510-21388-1-git-send-email-jic23@kernel.org>
No known use case and complicates in kernel interface work.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
---
drivers/staging/iio/adc/ad7887.h | 5 ----
drivers/staging/iio/adc/ad7887_core.c | 2 +-
drivers/staging/iio/adc/ad7887_ring.c | 34 ---------------------------------
3 files changed, 1 insertions(+), 40 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7887.h b/drivers/staging/iio/adc/ad7887.h
index 3452d18..bc53b65 100644
--- a/drivers/staging/iio/adc/ad7887.h
+++ b/drivers/staging/iio/adc/ad7887.h
@@ -83,14 +83,9 @@ enum ad7887_supported_device_ids {
};
#ifdef CONFIG_IIO_BUFFER
-int ad7887_scan_from_ring(struct ad7887_state *st, int channum);
int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev);
void ad7887_ring_cleanup(struct iio_dev *indio_dev);
#else /* CONFIG_IIO_BUFFER */
-static inline int ad7887_scan_from_ring(struct ad7887_state *st, int channum)
-{
- return 0;
-}
static inline int
ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c
index ab7a5a2..db7e91f 100644
--- a/drivers/staging/iio/adc/ad7887_core.c
+++ b/drivers/staging/iio/adc/ad7887_core.c
@@ -45,7 +45,7 @@ static int ad7887_read_raw(struct iio_dev *indio_dev,
case 0:
mutex_lock(&indio_dev->mlock);
if (iio_buffer_enabled(indio_dev))
- ret = ad7887_scan_from_ring(st, 1 << chan->address);
+ ret = -EBUSY;
else
ret = ad7887_scan_direct(st, chan->address);
mutex_unlock(&indio_dev->mlock);
diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
index f53a663..85076cd 100644
--- a/drivers/staging/iio/adc/ad7887_ring.c
+++ b/drivers/staging/iio/adc/ad7887_ring.c
@@ -19,40 +19,6 @@
#include "ad7887.h"
-int ad7887_scan_from_ring(struct ad7887_state *st, int channum)
-{
- struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
- int count = 0, ret;
- u16 *ring_data;
-
- if (!(test_bit(channum, ring->scan_mask))) {
- ret = -EBUSY;
- goto error_ret;
- }
-
- ring_data = kmalloc(ring->access->get_bytes_per_datum(ring),
- GFP_KERNEL);
- if (ring_data == NULL) {
- ret = -ENOMEM;
- goto error_ret;
- }
- ret = ring->access->read_last(ring, (u8 *) ring_data);
- if (ret)
- goto error_free_ring_data;
-
- /* for single channel scan the result is stored with zero offset */
- if ((test_bit(1, ring->scan_mask) || test_bit(0, ring->scan_mask)) &&
- (channum == 1))
- count = 1;
-
- ret = be16_to_cpu(ring_data[count]);
-
-error_free_ring_data:
- kfree(ring_data);
-error_ret:
- return ret;
-}
-
/**
* ad7887_ring_preenable() setup the parameters of the ring before enabling
*
--
1.7.7.4
next prev parent reply other threads:[~2011-12-05 22:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1323123510-21388-1-git-send-email-jic23@kernel.org>
2011-12-05 22:18 ` [PATCH 01/19] staging:iio:buffer drop bpe field Jonathan Cameron
2011-12-05 22:18 ` [PATCH 02/19] staging:iio: remove userspace access to bytes per datum Jonathan Cameron
2011-12-05 22:18 ` [PATCH 04/19] staging:iio: scrap scan_count and ensure all drivers use active_scan_mask Jonathan Cameron
2011-12-05 22:18 ` [PATCH 07/19] staging:iio:adc:ad7192 scrap read from buffer for sysfs access Jonathan Cameron
2011-12-05 22:18 ` Jonathan Cameron [this message]
2011-12-05 22:18 ` [PATCH 15/19] staging:iio:ring_sw don't provide read last function Jonathan Cameron
2011-12-05 22:18 ` [PATCH 17/19] staging:iio:buffer scrap to_iio_buffer as it no longer has meaning Jonathan Cameron
2011-12-05 22:18 ` [PATCH 18/19] staging:iio:buffer struct iio_buffer doesn't need an indio_dev pointer Jonathan Cameron
2011-12-05 22:18 ` [PATCH 19/19] staging:iio:buffer.h update struct buffer docs Jonathan Cameron
2011-12-08 20:14 ` [PATCH 00/19] staging:iio:buffer clean ups Greg KH
2011-12-10 14:00 ` 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=1323123510-21388-13-git-send-email-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=greg@kroah.com \
--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).