diff options
Diffstat (limited to 'drivers/staging/iio/accel/adis16240_ring.c')
| -rw-r--r-- | drivers/staging/iio/accel/adis16240_ring.c | 131 |
1 files changed, 41 insertions, 90 deletions
diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c index f882e9c150e2..0c6d781d94c6 100644 --- a/drivers/staging/iio/accel/adis16240_ring.c +++ b/drivers/staging/iio/accel/adis16240_ring.c @@ -17,59 +17,6 @@ #include "../trigger.h" #include "adis16240.h" -static IIO_SCAN_EL_C(in_supply, ADIS16240_SCAN_SUPPLY, - ADIS16240_SUPPLY_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(in_supply, u, 10, 16); -static IIO_SCAN_EL_C(accel_x, ADIS16240_SCAN_ACC_X, ADIS16240_XACCL_OUT, NULL); -static IIO_SCAN_EL_C(accel_y, ADIS16240_SCAN_ACC_Y, ADIS16240_YACCL_OUT, NULL); -static IIO_SCAN_EL_C(accel_z, ADIS16240_SCAN_ACC_Z, ADIS16240_ZACCL_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 10, 16); -static IIO_SCAN_EL_C(in0, ADIS16240_SCAN_AUX_ADC, ADIS16240_AUX_ADC, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(in0, u, 10, 16); -static IIO_SCAN_EL_C(temp, ADIS16240_SCAN_TEMP, ADIS16240_TEMP_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, u, 10, 16); -static IIO_SCAN_EL_TIMESTAMP(6); -static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64); - -static struct attribute *adis16240_scan_el_attrs[] = { - &iio_scan_el_in_supply.dev_attr.attr, - &iio_const_attr_in_supply_index.dev_attr.attr, - &iio_const_attr_in_supply_type.dev_attr.attr, - &iio_scan_el_accel_x.dev_attr.attr, - &iio_const_attr_accel_x_index.dev_attr.attr, - &iio_scan_el_accel_y.dev_attr.attr, - &iio_const_attr_accel_y_index.dev_attr.attr, - &iio_scan_el_accel_z.dev_attr.attr, - &iio_const_attr_accel_z_index.dev_attr.attr, - &iio_const_attr_accel_type.dev_attr.attr, - &iio_scan_el_in0.dev_attr.attr, - &iio_const_attr_in0_index.dev_attr.attr, - &iio_const_attr_in0_type.dev_attr.attr, - &iio_scan_el_temp.dev_attr.attr, - &iio_const_attr_temp_index.dev_attr.attr, - &iio_const_attr_temp_type.dev_attr.attr, - &iio_scan_el_timestamp.dev_attr.attr, - &iio_const_attr_timestamp_index.dev_attr.attr, - &iio_const_attr_timestamp_type.dev_attr.attr, - NULL, -}; - -static struct attribute_group adis16240_scan_el_group = { - .attrs = adis16240_scan_el_attrs, - .name = "scan_elements", -}; - -/** - * adis16240_poll_func_th() top half interrupt handler called by trigger - * @private_data: iio_dev - **/ -static void adis16240_poll_func_th(struct iio_dev *indio_dev, s64 time) -{ - struct adis16240_state *st = iio_dev_get_devdata(indio_dev); - st->last_timestamp = time; - schedule_work(&st->work_trigger_to_ring); -} - /** * adis16240_read_ring_data() read data registers which will be placed into ring * @dev: device associated with child of actual device (iio_dev or iio_trig) @@ -112,56 +59,56 @@ static int adis16240_read_ring_data(struct device *dev, u8 *rx) return ret; } - -static void adis16240_trigger_bh_to_ring(struct work_struct *work_s) +static irqreturn_t adis16240_trigger_handler(int irq, void *p) { - struct adis16240_state *st - = container_of(work_s, struct adis16240_state, - work_trigger_to_ring); - struct iio_ring_buffer *ring = st->indio_dev->ring; + struct iio_poll_func *pf = p; + struct iio_dev *indio_dev = pf->private_data; + struct adis16240_state *st = iio_dev_get_devdata(indio_dev); + struct iio_ring_buffer *ring = indio_dev->ring; int i = 0; s16 *data; - size_t datasize = ring->access.get_bytes_per_datum(ring); + size_t datasize = ring->access->get_bytes_per_datum(ring); - data = kmalloc(datasize , GFP_KERNEL); + data = kmalloc(datasize, GFP_KERNEL); if (data == NULL) { dev_err(&st->us->dev, "memory alloc failed in ring bh"); - return; + return -ENOMEM; } - if (ring->scan_count) - if (adis16240_read_ring_data(&st->indio_dev->dev, st->rx) >= 0) - for (; i < ring->scan_count; i++) - data[i] = be16_to_cpup( - (__be16 *)&(st->rx[i*2])); + if (ring->scan_count && + adis16240_read_ring_data(&st->indio_dev->dev, st->rx) >= 0) + for (; i < ring->scan_count; i++) + data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2])); /* Guaranteed to be aligned with 8 byte boundary */ if (ring->scan_timestamp) - *((s64 *)(data + ((i + 3)/4)*4)) = st->last_timestamp; + *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; - ring->access.store_to(ring, - (u8 *)data, - st->last_timestamp); + ring->access->store_to(ring, (u8 *)data, pf->timestamp); iio_trigger_notify_done(st->indio_dev->trig); kfree(data); - return; + return IRQ_HANDLED; } void adis16240_unconfigure_ring(struct iio_dev *indio_dev) { - kfree(indio_dev->pollfunc); + iio_dealloc_pollfunc(indio_dev->pollfunc); iio_sw_rb_free(indio_dev->ring); } +static const struct iio_ring_setup_ops adis16240_ring_setup_ops = { + .preenable = &iio_sw_ring_preenable, + .postenable = &iio_triggered_ring_postenable, + .predisable = &iio_triggered_ring_predisable, +}; + int adis16240_configure_ring(struct iio_dev *indio_dev) { int ret = 0; - struct adis16240_state *st = indio_dev->dev_data; struct iio_ring_buffer *ring; - INIT_WORK(&st->work_trigger_to_ring, adis16240_trigger_bh_to_ring); ring = iio_sw_rb_allocate(indio_dev); if (!ring) { @@ -170,26 +117,31 @@ int adis16240_configure_ring(struct iio_dev *indio_dev) } indio_dev->ring = ring; /* Effectively select the ring buffer implementation */ - iio_ring_sw_register_funcs(&ring->access); + ring->access = &ring_sw_access_funcs; ring->bpe = 2; - ring->scan_el_attrs = &adis16240_scan_el_group; ring->scan_timestamp = true; - ring->preenable = &iio_sw_ring_preenable; - ring->postenable = &iio_triggered_ring_postenable; - ring->predisable = &iio_triggered_ring_predisable; + ring->setup_ops = &adis16240_ring_setup_ops; ring->owner = THIS_MODULE; /* Set default scan mode */ - iio_scan_mask_set(ring, iio_scan_el_in_supply.number); - iio_scan_mask_set(ring, iio_scan_el_accel_x.number); - iio_scan_mask_set(ring, iio_scan_el_accel_y.number); - iio_scan_mask_set(ring, iio_scan_el_accel_z.number); - iio_scan_mask_set(ring, iio_scan_el_temp.number); - iio_scan_mask_set(ring, iio_scan_el_in0.number); - - ret = iio_alloc_pollfunc(indio_dev, NULL, &adis16240_poll_func_th); - if (ret) + iio_scan_mask_set(ring, ADIS16240_SCAN_SUPPLY); + iio_scan_mask_set(ring, ADIS16240_SCAN_ACC_X); + iio_scan_mask_set(ring, ADIS16240_SCAN_ACC_Y); + iio_scan_mask_set(ring, ADIS16240_SCAN_ACC_Z); + iio_scan_mask_set(ring, ADIS16240_SCAN_AUX_ADC); + iio_scan_mask_set(ring, ADIS16240_SCAN_TEMP); + + indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time, + &adis16240_trigger_handler, + IRQF_ONESHOT, + indio_dev, + "%s_consumer%d", + indio_dev->name, + indio_dev->id); + if (indio_dev->pollfunc == NULL) { + ret = -ENOMEM; goto error_iio_sw_rb_free; + } indio_dev->modes |= INDIO_RING_TRIGGERED; return 0; @@ -198,4 +150,3 @@ error_iio_sw_rb_free: iio_sw_rb_free(indio_dev->ring); return ret; } - |