diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-05-18 13:41:49 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 23:14:55 (GMT) |
commit | a34c26dcd48a0c6e03ea175e152e787414861aa2 (patch) | |
tree | cd0787e70c059b208e9424ea0d5bad84ed92f028 /drivers/staging/iio/accel/adis16209_ring.c | |
parent | ad3eb9ab1276cc69bb9cc72dffc074d1a317a6c0 (diff) | |
download | linux-fsl-qoriq-a34c26dcd48a0c6e03ea175e152e787414861aa2.tar.xz |
staging:iio:accel:adis16209 move to chan_spec based setup.
For clean drivers its easier to convert to chan_spec based
registration than to work around the scan_el attributes
going away.
Some minor cleanups done whilst here.
Untested.
V2: IIO_CHAN macro used.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/adis16209_ring.c')
-rw-r--r-- | drivers/staging/iio/accel/adis16209_ring.c | 71 |
1 files changed, 8 insertions, 63 deletions
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c index 6e66469..2c7be3b 100644 --- a/drivers/staging/iio/accel/adis16209_ring.c +++ b/drivers/staging/iio/accel/adis16209_ring.c @@ -17,60 +17,6 @@ #include "../trigger.h" #include "adis16209.h" -static IIO_SCAN_EL_C(in_supply, ADIS16209_SCAN_SUPPLY, - ADIS16209_SUPPLY_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(in_supply, u, 14, 16) -static IIO_SCAN_EL_C(accel_x, ADIS16209_SCAN_ACC_X, ADIS16209_XACCL_OUT, NULL); -static IIO_SCAN_EL_C(accel_y, ADIS16209_SCAN_ACC_Y, ADIS16209_YACCL_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 14, 16); -static IIO_SCAN_EL_C(in0, ADIS16209_SCAN_AUX_ADC, ADIS16209_AUX_ADC, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(in0, u, 12, 16); -static IIO_SCAN_EL_C(temp, ADIS16209_SCAN_TEMP, ADIS16209_TEMP_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, u, 12, 16); -static IIO_SCAN_EL_C(incli_x, ADIS16209_SCAN_INCLI_X, - ADIS16209_XINCL_OUT, NULL); -static IIO_SCAN_EL_C(incli_y, ADIS16209_SCAN_INCLI_Y, - ADIS16209_YINCL_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(incli, s, 14, 16); -static IIO_SCAN_EL_C(rot, ADIS16209_SCAN_ROT, ADIS16209_ROT_OUT, NULL); -static IIO_CONST_ATTR_SCAN_EL_TYPE(rot, s, 14, 16); -static IIO_SCAN_EL_TIMESTAMP(8); -static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64); - -static struct attribute *adis16209_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_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_incli_x.dev_attr.attr, - &iio_const_attr_incli_x_index.dev_attr.attr, - &iio_scan_el_incli_y.dev_attr.attr, - &iio_const_attr_incli_y_index.dev_attr.attr, - &iio_const_attr_incli_type.dev_attr.attr, - &iio_scan_el_rot.dev_attr.attr, - &iio_const_attr_rot_index.dev_attr.attr, - &iio_const_attr_rot_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 adis16209_scan_el_group = { - .attrs = adis16209_scan_el_attrs, - .name = "scan_elements", -}; - /** * adis16209_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) @@ -171,7 +117,6 @@ int adis16209_configure_ring(struct iio_dev *indio_dev) /* Effectively select the ring buffer implementation */ iio_ring_sw_register_funcs(&ring->access); ring->bpe = 2; - ring->scan_el_attrs = &adis16209_scan_el_group; ring->scan_timestamp = true; ring->preenable = &iio_sw_ring_preenable; ring->postenable = &iio_triggered_ring_postenable; @@ -179,14 +124,14 @@ int adis16209_configure_ring(struct iio_dev *indio_dev) 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_rot.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_temp.number); - iio_scan_mask_set(ring, iio_scan_el_in0.number); - iio_scan_mask_set(ring, iio_scan_el_incli_x.number); - iio_scan_mask_set(ring, iio_scan_el_incli_y.number); + iio_scan_mask_set(ring, ADIS16209_SCAN_SUPPLY); + iio_scan_mask_set(ring, ADIS16209_SCAN_ACC_X); + iio_scan_mask_set(ring, ADIS16209_SCAN_ACC_Y); + iio_scan_mask_set(ring, ADIS16209_SCAN_AUX_ADC); + iio_scan_mask_set(ring, ADIS16209_SCAN_TEMP); + iio_scan_mask_set(ring, ADIS16209_SCAN_INCLI_X); + iio_scan_mask_set(ring, ADIS16209_SCAN_INCLI_Y); + iio_scan_mask_set(ring, ADIS16209_SCAN_ROT); indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL); if (indio_dev->pollfunc == NULL) { |