staging: iio sync drivers with current ABI

[mv-sheeva.git] / drivers / staging / iio / accel / adis16209_ring.c

diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index 120bf91e0aca666b23ff5a0d5012c341837808eb..3eb1d559eb693ac8c3857508c18ded8b51a14855 100644 (file)
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -17,13 +17,13 @@
 #include "../trigger.h"
 #include "adis16209.h"
 
-static IIO_SCAN_EL_C(supply, ADIS16209_SCAN_SUPPLY, IIO_UNSIGNED(14),
+static IIO_SCAN_EL_C(in_supply, ADIS16209_SCAN_SUPPLY, IIO_UNSIGNED(14),
                     ADIS16209_SUPPLY_OUT, NULL);
 static IIO_SCAN_EL_C(accel_x, ADIS16209_SCAN_ACC_X, IIO_SIGNED(14),
                     ADIS16209_XACCL_OUT, NULL);
 static IIO_SCAN_EL_C(accel_y, ADIS16209_SCAN_ACC_Y, IIO_SIGNED(14),
                     ADIS16209_YACCL_OUT, NULL);
-static IIO_SCAN_EL_C(aux_adc, ADIS16209_SCAN_AUX_ADC, IIO_UNSIGNED(12),
+static IIO_SCAN_EL_C(in0, ADIS16209_SCAN_AUX_ADC, IIO_UNSIGNED(12),
                     ADIS16209_AUX_ADC, NULL);
 static IIO_SCAN_EL_C(temp, ADIS16209_SCAN_TEMP, IIO_UNSIGNED(12),
                     ADIS16209_TEMP_OUT, NULL);
@@ -37,10 +37,10 @@ static IIO_SCAN_EL_C(rot, ADIS16209_SCAN_ROT, IIO_SIGNED(14),
 static IIO_SCAN_EL_TIMESTAMP(8);
 
 static struct attribute *adis16209_scan_el_attrs[] = {
-       &iio_scan_el_supply.dev_attr.attr,
+       &iio_scan_el_in_supply.dev_attr.attr,
        &iio_scan_el_accel_x.dev_attr.attr,
        &iio_scan_el_accel_y.dev_attr.attr,
-       &iio_scan_el_aux_adc.dev_attr.attr,
+       &iio_scan_el_in0.dev_attr.attr,
        &iio_scan_el_temp.dev_attr.attr,
        &iio_scan_el_incli_x.dev_attr.attr,
        &iio_scan_el_incli_y.dev_attr.attr,
@@ -177,12 +177,12 @@ 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_supply.number);
+       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_aux_adc.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);