diff options
Diffstat (limited to 'drivers/staging/iio/adc/max1363_ring.c')
| -rw-r--r-- | drivers/staging/iio/adc/max1363_ring.c | 109 |
1 files changed, 46 insertions, 63 deletions
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c index d36fcc6..f43befd 100644 --- a/drivers/staging/iio/adc/max1363_ring.c +++ b/drivers/staging/iio/adc/max1363_ring.c @@ -9,8 +9,6 @@ */ #include <linux/interrupt.h> -#include <linux/gpio.h> -#include <linux/workqueue.h> #include <linux/device.h> #include <linux/slab.h> #include <linux/kernel.h> @@ -27,10 +25,9 @@ #include "max1363.h" -/* Todo: test this */ int max1363_single_channel_from_ring(long mask, struct max1363_state *st) { - struct iio_ring_buffer *ring = st->indio_dev->ring; + struct iio_ring_buffer *ring = iio_priv_to_dev(st)->ring; int count = 0, ret; u8 *ring_data; if (!(st->current_mode->modemask & mask)) { @@ -38,12 +35,13 @@ int max1363_single_channel_from_ring(long mask, struct max1363_state *st) 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, ring_data); + ret = ring->access->read_last(ring, ring_data); if (ret) goto error_free_ring_data; /* Need a count of channels prior to this one */ @@ -65,6 +63,7 @@ error_ret: return ret; } + /** * max1363_ring_preenable() - setup the parameters of the ring before enabling * @@ -74,9 +73,9 @@ error_ret: **/ static int max1363_ring_preenable(struct iio_dev *indio_dev) { - struct max1363_state *st = indio_dev->dev_data; + struct max1363_state *st = iio_priv(indio_dev); struct iio_ring_buffer *ring = indio_dev->ring; - size_t d_size; + size_t d_size = 0; unsigned long numvals; /* @@ -91,50 +90,26 @@ static int max1363_ring_preenable(struct iio_dev *indio_dev) max1363_set_scan_mode(st); numvals = hweight_long(st->current_mode->modemask); - if (ring->access.set_bytes_per_datum) { + if (ring->access->set_bytes_per_datum) { + if (ring->scan_timestamp) + d_size += sizeof(s64); if (st->chip_info->bits != 8) - d_size = numvals*2 + sizeof(s64); + d_size += numvals*2; else - d_size = numvals + sizeof(s64); - if (d_size % 8) + d_size += numvals; + if (ring->scan_timestamp && (d_size % 8)) d_size += 8 - (d_size % 8); - ring->access.set_bytes_per_datum(ring, d_size); + ring->access->set_bytes_per_datum(ring, d_size); } return 0; } - -/** - * max1363_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 max1363_poll_func_th(struct iio_dev *indio_dev, s64 time) +static irqreturn_t max1363_trigger_handler(int irq, void *p) { - struct max1363_state *st = indio_dev->dev_data; - - schedule_work(&st->poll_work); - - return; -} -/** - * max1363_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 max1363_poll_bh_to_ring(struct work_struct *work_s) -{ - struct max1363_state *st = container_of(work_s, struct max1363_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 max1363_state *st = iio_priv(indio_dev); s64 time_ns; __u8 *rxbuf; int b_sent; @@ -149,20 +124,16 @@ static void max1363_poll_bh_to_ring(struct work_struct *work_s) if (d_size % sizeof(s64)) d_size += sizeof(s64) - (d_size % sizeof(s64)); - /* Ensure only one copy of this function running at a time */ - if (atomic_inc_return(&st->protect_ring) > 1) - return; - /* Monitor mode prevents reading. Whilst not currently implemented * might as well have this test in here in the meantime as it does * no harm. */ if (numvals == 0) - return; + return IRQ_HANDLED; rxbuf = kmalloc(d_size, GFP_KERNEL); if (rxbuf == NULL) - return; + return -ENOMEM; if (st->chip_info->bits != 8) b_sent = i2c_master_recv(st->client, rxbuf, numvals*2); else @@ -174,16 +145,23 @@ static void max1363_poll_bh_to_ring(struct work_struct *work_s) memcpy(rxbuf + 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 max1363_ring_setup_ops = { + .postenable = &iio_triggered_ring_postenable, + .preenable = &max1363_ring_preenable, + .predisable = &iio_triggered_ring_predisable, +}; int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev) { - struct max1363_state *st = indio_dev->dev_data; + struct max1363_state *st = iio_priv(indio_dev); int ret = 0; indio_dev->ring = iio_sw_rb_allocate(indio_dev); @@ -191,22 +169,27 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev) ret = -ENOMEM; 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, &max1363_poll_func_th); - if (ret) + indio_dev->pollfunc = iio_alloc_pollfunc(NULL, + &max1363_trigger_handler, + IRQF_ONESHOT, + indio_dev, + "%s_consumer%d", + st->client->name, + indio_dev->id); + if (indio_dev->pollfunc == NULL) { + ret = -ENOMEM; goto error_deallocate_sw_rb; - + } + /* Effectively select the ring buffer implementation */ + indio_dev->ring->access = &ring_sw_access_funcs; /* Ring buffer functions - here trigger setup related */ - indio_dev->ring->scan_el_attrs = st->chip_info->scan_attrs; - indio_dev->ring->postenable = &iio_triggered_ring_postenable; - indio_dev->ring->preenable = &max1363_ring_preenable; - indio_dev->ring->predisable = &iio_triggered_ring_predisable; - INIT_WORK(&st->poll_work, &max1363_poll_bh_to_ring); + indio_dev->ring->setup_ops = &max1363_ring_setup_ops; /* 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: @@ -221,6 +204,6 @@ void max1363_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); } |