diff options
Diffstat (limited to 'drivers/staging/iio/adc/ad799x_ring.c')
-rw-r--r-- | drivers/staging/iio/adc/ad799x_ring.c | 93 |
1 files changed, 41 insertions, 52 deletions
diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c index 0875a7ef67a5..1ae8857b3d25 100644 --- a/drivers/staging/iio/adc/ad799x_ring.c +++ b/drivers/staging/iio/adc/ad799x_ring.c @@ -10,7 +10,6 @@ */ #include <linux/interrupt.h> -#include <linux/workqueue.h> #include <linux/device.h> #include <linux/slab.h> #include <linux/kernel.h> @@ -29,7 +28,7 @@ int ad799x_single_channel_from_ring(struct ad799x_state *st, long mask) { - struct iio_ring_buffer *ring = st->indio_dev->ring; + struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring; int count = 0, ret; u16 *ring_data; @@ -38,12 +37,13 @@ int ad799x_single_channel_from_ring(struct ad799x_state *st, long mask) goto error_ret; } - 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, (u8 *) ring_data); + ret = ring->access->read_last(ring, (u8 *) ring_data); if (ret) goto error_free_ring_data; /* Need a count of channels prior to this one */ @@ -72,7 +72,7 @@ error_ret: static int ad799x_ring_preenable(struct iio_dev *indio_dev) { struct iio_ring_buffer *ring = indio_dev->ring; - struct ad799x_state *st = indio_dev->dev_data; + struct ad799x_state *st = iio_dev_get_devdata(indio_dev); /* * Need to figure out the current mode based upon the requested @@ -80,7 +80,7 @@ static int ad799x_ring_preenable(struct iio_dev *indio_dev) */ if (st->id == ad7997 || st->id == ad7998) - ad799x_set_scan_mode(st, ring->scan_mask); + ad7997_8_set_scan_mode(st, ring->scan_mask); st->d_size = ring->scan_count * 2; @@ -91,56 +91,34 @@ static int ad799x_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; } /** - * ad799x_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 ad799x_poll_func_th(struct iio_dev *indio_dev, s64 time) -{ - struct ad799x_state *st = indio_dev->dev_data; - - schedule_work(&st->poll_work); - - return; -} -/** - * ad799x_poll_bh_to_ring() bh of trigger launched polling to ring buffer - * @work_s: the work struct through which this was scheduled + * ad799x_trigger_handler() bh of trigger launched polling to ring buffer * * 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 ad799x_poll_bh_to_ring(struct work_struct *work_s) + +static irqreturn_t ad799x_trigger_handler(int irq, void *p) { - struct ad799x_state *st = container_of(work_s, struct ad799x_state, - poll_work); - struct iio_dev *indio_dev = st->indio_dev; + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->private_data; + struct ad799x_state *st = iio_dev_get_devdata(indio_dev); struct iio_ring_buffer *ring = indio_dev->ring; - struct iio_sw_ring_buffer *ring_sw = iio_to_sw_ring(indio_dev->ring); s64 time_ns; __u8 *rxbuf; int b_sent; u8 cmd; - /* Ensure only one copy of this function running at a time */ - if (atomic_inc_return(&st->protect_ring) > 1) - return; - rxbuf = kmalloc(st->d_size, GFP_KERNEL); if (rxbuf == NULL) - return; + goto out; switch (st->id) { case ad7991: @@ -173,16 +151,25 @@ static void ad799x_poll_bh_to_ring(struct work_struct *work_s) memcpy(rxbuf + st->d_size - sizeof(s64), &time_ns, sizeof(time_ns)); - ring->access.store_to(&ring_sw->buf, rxbuf, time_ns); + ring->access->store_to(indio_dev->ring, rxbuf, time_ns); done: kfree(rxbuf); - atomic_dec(&st->protect_ring); + if (b_sent < 0) + return b_sent; +out: + iio_trigger_notify_done(indio_dev->trig); + + return IRQ_HANDLED; } +static const struct iio_ring_setup_ops ad799x_buf_setup_ops = { + .preenable = &ad799x_ring_preenable, + .postenable = &iio_triggered_ring_postenable, + .predisable = &iio_triggered_ring_predisable, +}; int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev) { - struct ad799x_state *st = indio_dev->dev_data; int ret = 0; indio_dev->ring = iio_sw_rb_allocate(indio_dev); @@ -191,25 +178,27 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev) goto error_ret; } /* Effectively select the ring buffer implementation */ - iio_ring_sw_register_funcs(&st->indio_dev->ring->access); - ret = iio_alloc_pollfunc(indio_dev, NULL, &ad799x_poll_func_th); - if (ret) + indio_dev->ring->access = &ring_sw_access_funcs; + indio_dev->pollfunc = iio_alloc_pollfunc(NULL, + &ad799x_trigger_handler, + IRQF_ONESHOT, + indio_dev, + "%s_consumer%d", + indio_dev->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 = &ad799x_ring_preenable; - indio_dev->ring->postenable = &iio_triggered_ring_postenable; - indio_dev->ring->predisable = &iio_triggered_ring_predisable; + indio_dev->ring->setup_ops = &ad799x_buf_setup_ops; indio_dev->ring->scan_timestamp = true; - INIT_WORK(&st->poll_work, &ad799x_poll_bh_to_ring); - - indio_dev->ring->scan_el_attrs = st->chip_info->scan_attrs; - /* 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: @@ -224,6 +213,6 @@ void ad799x_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); } |