diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-05-18 14:41:58 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:14:57 -0700 |
commit | cd69f57dee75cb27337bf5438359aae86503873f (patch) | |
tree | 4f0c2af82e82bf54cc2b1e47349bd7c9f4dde923 /drivers/staging/iio/accel/adis16240_ring.c | |
parent | eb7fea53e53ed47e82b4cc9911dd8fdc7f953de5 (diff) | |
download | linux-rt-cd69f57dee75cb27337bf5438359aae86503873f.tar.gz |
staging:iio:accel:adis16240 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 use updated.
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/adis16240_ring.c')
-rw-r--r-- | drivers/staging/iio/accel/adis16240_ring.c | 55 |
1 files changed, 6 insertions, 49 deletions
diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c index a6d27d213921..bddd6990b3db 100644 --- a/drivers/staging/iio/accel/adis16240_ring.c +++ b/drivers/staging/iio/accel/adis16240_ring.c @@ -17,48 +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_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) @@ -156,7 +114,6 @@ int adis16240_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 = &adis16240_scan_el_group; ring->scan_timestamp = true; ring->preenable = &iio_sw_ring_preenable; ring->postenable = &iio_triggered_ring_postenable; @@ -164,12 +121,12 @@ int adis16240_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_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); + 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 = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL); if (indio_dev->pollfunc == NULL) { |