diff options
Diffstat (limited to 'drivers/staging/iio/adc/ad7476_ring.c')
-rw-r--r-- | drivers/staging/iio/adc/ad7476_ring.c | 127 |
1 files changed, 39 insertions, 88 deletions
diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c index 92d93787d5b8..b1b2ee2c56b0 100644 --- a/drivers/staging/iio/adc/ad7476_ring.c +++ b/drivers/staging/iio/adc/ad7476_ring.c @@ -8,13 +8,10 @@ */ #include <linux/interrupt.h> -#include <linux/gpio.h> -#include <linux/workqueue.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/sysfs.h> -#include <linux/list.h> #include <linux/spi/spi.h> #include "../iio.h" @@ -25,51 +22,19 @@ #include "ad7476.h" -static IIO_SCAN_EL_C(in0, 0, 0, NULL); -static IIO_SCAN_EL_TIMESTAMP(1); -static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64); - -static ssize_t ad7476_show_type(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_ring_buffer *ring = dev_get_drvdata(dev); - struct iio_dev *indio_dev = ring->indio_dev; - struct ad7476_state *st = indio_dev->dev_data; - - return sprintf(buf, "%c%d/%d>>%d\n", st->chip_info->sign, - st->chip_info->bits, st->chip_info->storagebits, - st->chip_info->res_shift); -} -static IIO_DEVICE_ATTR(in_type, S_IRUGO, ad7476_show_type, NULL, 0); - -static struct attribute *ad7476_scan_el_attrs[] = { - &iio_scan_el_in0.dev_attr.attr, - &iio_const_attr_in0_index.dev_attr.attr, - &iio_const_attr_timestamp_index.dev_attr.attr, - &iio_scan_el_timestamp.dev_attr.attr, - &iio_const_attr_timestamp_type.dev_attr.attr, - &iio_dev_attr_in_type.dev_attr.attr, - NULL, -}; - -static struct attribute_group ad7476_scan_el_group = { - .name = "scan_elements", - .attrs = ad7476_scan_el_attrs, -}; - int ad7476_scan_from_ring(struct ad7476_state *st) { struct iio_ring_buffer *ring = st->indio_dev->ring; int ret; u8 *ring_data; - ring_data = kmalloc(ring->access.get_bytes_per_datum(ring), GFP_KERNEL); + 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, ring_data); + ret = ring->access->read_last(ring, ring_data); if (ret) goto error_free_ring_data; @@ -93,7 +58,8 @@ static int ad7476_ring_preenable(struct iio_dev *indio_dev) struct ad7476_state *st = indio_dev->dev_data; struct iio_ring_buffer *ring = indio_dev->ring; - st->d_size = ring->scan_count * st->chip_info->storagebits / 8; + st->d_size = ring->scan_count * + st->chip_info->channel[0].scan_type.storagebits / 8; if (ring->scan_timestamp) { st->d_size += sizeof(s64); @@ -102,55 +68,28 @@ static int ad7476_ring_preenable(struct iio_dev *indio_dev) st->d_size += sizeof(s64) - (st->d_size % sizeof(s64)); } - if (indio_dev->ring->access.set_bytes_per_datum) - indio_dev->ring->access.set_bytes_per_datum(indio_dev->ring, + if (indio_dev->ring->access->set_bytes_per_datum) + indio_dev->ring->access->set_bytes_per_datum(indio_dev->ring, st->d_size); return 0; } -/** - * ad7476_poll_func_th() th of trigger launched polling to ring buffer - * - * As sampling only occurs on i2c comms occurring, leave timestamping until - * then. Some triggers will generate their own time stamp. Currently - * there is no way of notifying them when no one cares. - **/ -static void ad7476_poll_func_th(struct iio_dev *indio_dev, s64 time) +static irqreturn_t ad7476_trigger_handler(int irq, void *p) { - struct ad7476_state *st = indio_dev->dev_data; - - schedule_work(&st->poll_work); - return; -} -/** - * ad7476_poll_bh_to_ring() bh of trigger launched polling to ring buffer - * @work_s: the work struct through which this was scheduled - * - * Currently there is no option in this driver to disable the saving of - * timestamps within the ring. - * I think the one copy of this at a time was to avoid problems if the - * trigger was set far too high and the reads then locked up the computer. - **/ -static void ad7476_poll_bh_to_ring(struct work_struct *work_s) -{ - struct ad7476_state *st = container_of(work_s, struct ad7476_state, - poll_work); - struct iio_dev *indio_dev = st->indio_dev; - struct iio_sw_ring_buffer *sw_ring = iio_to_sw_ring(indio_dev->ring); + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->private_data; + struct ad7476_state *st = iio_dev_get_devdata(indio_dev); s64 time_ns; __u8 *rxbuf; int b_sent; - /* Ensure only one copy of this function running at a time */ - if (atomic_inc_return(&st->protect_ring) > 1) - return; - rxbuf = kzalloc(st->d_size, GFP_KERNEL); if (rxbuf == NULL) - return; + return -ENOMEM; - b_sent = spi_read(st->spi, rxbuf, st->chip_info->storagebits / 8); + b_sent = spi_read(st->spi, rxbuf, + st->chip_info->channel[0].scan_type.storagebits / 8); if (b_sent < 0) goto done; @@ -160,12 +99,20 @@ static void ad7476_poll_bh_to_ring(struct work_struct *work_s) memcpy(rxbuf + st->d_size - sizeof(s64), &time_ns, sizeof(time_ns)); - indio_dev->ring->access.store_to(&sw_ring->buf, rxbuf, time_ns); + indio_dev->ring->access->store_to(indio_dev->ring, rxbuf, time_ns); done: + iio_trigger_notify_done(indio_dev->trig); kfree(rxbuf); - atomic_dec(&st->protect_ring); + + return IRQ_HANDLED; } +static const struct iio_ring_setup_ops ad7476_ring_setup_ops = { + .preenable = &ad7476_ring_preenable, + .postenable = &iio_triggered_ring_postenable, + .predisable = &iio_triggered_ring_predisable, +}; + int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev) { struct ad7476_state *st = indio_dev->dev_data; @@ -177,24 +124,28 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev) goto error_ret; } /* Effectively select the ring buffer implementation */ - iio_ring_sw_register_funcs(&indio_dev->ring->access); - ret = iio_alloc_pollfunc(indio_dev, NULL, &ad7476_poll_func_th); - if (ret) + indio_dev->ring->access = &ring_sw_access_funcs; + indio_dev->pollfunc + = iio_alloc_pollfunc(NULL, + &ad7476_trigger_handler, + IRQF_ONESHOT, + indio_dev, + "%s_consumer%d", + spi_get_device_id(st->spi)->name, + indio_dev->id); + if (indio_dev->pollfunc == NULL) { + ret = -ENOMEM; goto error_deallocate_sw_rb; + } /* Ring buffer functions - here trigger setup related */ - - indio_dev->ring->preenable = &ad7476_ring_preenable; - indio_dev->ring->postenable = &iio_triggered_ring_postenable; - indio_dev->ring->predisable = &iio_triggered_ring_predisable; - indio_dev->ring->scan_el_attrs = &ad7476_scan_el_group; + indio_dev->ring->setup_ops = &ad7476_ring_setup_ops; indio_dev->ring->scan_timestamp = true; - INIT_WORK(&st->poll_work, &ad7476_poll_bh_to_ring); - /* Flag that polled ring buffering is possible */ indio_dev->modes |= INDIO_RING_TRIGGERED; return 0; + error_deallocate_sw_rb: iio_sw_rb_free(indio_dev->ring); error_ret: @@ -209,6 +160,6 @@ void ad7476_ring_cleanup(struct iio_dev *indio_dev) iio_trigger_dettach_poll_func(indio_dev->trig, indio_dev->pollfunc); } - kfree(indio_dev->pollfunc); + iio_dealloc_pollfunc(indio_dev->pollfunc); iio_sw_rb_free(indio_dev->ring); } |