diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-07-11 16:39:15 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 11:38:29 -0700 |
commit | 69584bd6d257e008fe4eeebd95c318201dc71d83 (patch) | |
tree | a1a0935301cccb6f4023e3f42404e18d6e2af806 /drivers/staging/iio/imu | |
parent | 2662051e0868d1bde0abeea19bd54c3c18941afc (diff) | |
download | kernel_samsung_smdk4412-69584bd6d257e008fe4eeebd95c318201dc71d83.zip kernel_samsung_smdk4412-69584bd6d257e008fe4eeebd95c318201dc71d83.tar.gz kernel_samsung_smdk4412-69584bd6d257e008fe4eeebd95c318201dc71d83.tar.bz2 |
staging: iio: Fix scan_element naming issue
The addition of a number to the scan_element names caused
an issue in drivers that used either #define or an enum
to provide the number. Before this fix names like
ADIS16350_ACCEL_X_accel_x_en occur rather than 5_accel_x_en.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/imu')
-rw-r--r-- | drivers/staging/iio/imu/adis16300.h | 20 | ||||
-rw-r--r-- | drivers/staging/iio/imu/adis16350.h | 24 | ||||
-rw-r--r-- | drivers/staging/iio/imu/adis16400.h | 26 |
3 files changed, 32 insertions, 38 deletions
diff --git a/drivers/staging/iio/imu/adis16300.h b/drivers/staging/iio/imu/adis16300.h index 3f59d7e..1f25d68 100644 --- a/drivers/staging/iio/imu/adis16300.h +++ b/drivers/staging/iio/imu/adis16300.h @@ -120,17 +120,15 @@ int adis16300_set_irq(struct device *dev, bool enable); * filling. This may change! */ -enum adis16300_scan { - ADIS16300_SCAN_SUPPLY, - ADIS16300_SCAN_GYRO_X, - ADIS16300_SCAN_ACC_X, - ADIS16300_SCAN_ACC_Y, - ADIS16300_SCAN_ACC_Z, - ADIS16300_SCAN_TEMP, - ADIS16300_SCAN_ADC_0, - ADIS16300_SCAN_INCLI_X, - ADIS16300_SCAN_INCLI_Y, -}; +#define ADIS16300_SCAN_SUPPLY 0 +#define ADIS16300_SCAN_GYRO_X 1 +#define ADIS16300_SCAN_ACC_X 2 +#define ADIS16300_SCAN_ACC_Y 3 +#define ADIS16300_SCAN_ACC_Z 4 +#define ADIS16300_SCAN_TEMP 5 +#define ADIS16300_SCAN_ADC_0 6 +#define ADIS16300_SCAN_INCLI_X 7 +#define ADIS16300_SCAN_INCLI_Y 8 void adis16300_remove_trigger(struct iio_dev *indio_dev); int adis16300_probe_trigger(struct iio_dev *indio_dev); diff --git a/drivers/staging/iio/imu/adis16350.h b/drivers/staging/iio/imu/adis16350.h index d94f6ab5..738deba 100644 --- a/drivers/staging/iio/imu/adis16350.h +++ b/drivers/staging/iio/imu/adis16350.h @@ -123,19 +123,17 @@ int adis16350_set_irq(struct device *dev, bool enable); #ifdef CONFIG_IIO_RING_BUFFER -enum adis16350_scan { - ADIS16350_SCAN_SUPPLY, - ADIS16350_SCAN_GYRO_X, - ADIS16350_SCAN_GYRO_Y, - ADIS16350_SCAN_GYRO_Z, - ADIS16350_SCAN_ACC_X, - ADIS16350_SCAN_ACC_Y, - ADIS16350_SCAN_ACC_Z, - ADIS16350_SCAN_TEMP_X, - ADIS16350_SCAN_TEMP_Y, - ADIS16350_SCAN_TEMP_Z, - ADIS16350_SCAN_ADC_0 -}; +#define ADIS16350_SCAN_SUPPLY 0 +#define ADIS16350_SCAN_GYRO_X 1 +#define ADIS16350_SCAN_GYRO_Y 2 +#define ADIS16350_SCAN_GYRO_Z 3 +#define ADIS16350_SCAN_ACC_X 4 +#define ADIS16350_SCAN_ACC_Y 5 +#define ADIS16350_SCAN_ACC_Z 6 +#define ADIS16350_SCAN_TEMP_X 7 +#define ADIS16350_SCAN_TEMP_Y 8 +#define ADIS16350_SCAN_TEMP_Z 9 +#define ADIS16350_SCAN_ADC_0 10 void adis16350_remove_trigger(struct iio_dev *indio_dev); int adis16350_probe_trigger(struct iio_dev *indio_dev); diff --git a/drivers/staging/iio/imu/adis16400.h b/drivers/staging/iio/imu/adis16400.h index 0685195..6ff33e1 100644 --- a/drivers/staging/iio/imu/adis16400.h +++ b/drivers/staging/iio/imu/adis16400.h @@ -152,20 +152,18 @@ int adis16400_set_irq(struct device *dev, bool enable); * filling. This may change! */ -enum adis16400_scan { - ADIS16400_SCAN_SUPPLY, - ADIS16400_SCAN_GYRO_X, - ADIS16400_SCAN_GYRO_Y, - ADIS16400_SCAN_GYRO_Z, - ADIS16400_SCAN_ACC_X, - ADIS16400_SCAN_ACC_Y, - ADIS16400_SCAN_ACC_Z, - ADIS16400_SCAN_MAGN_X, - ADIS16400_SCAN_MAGN_Y, - ADIS16400_SCAN_MAGN_Z, - ADIS16400_SCAN_TEMP, - ADIS16400_SCAN_ADC_0 -}; +#define ADIS16400_SCAN_SUPPLY 0 +#define ADIS16400_SCAN_GYRO_X 1 +#define ADIS16400_SCAN_GYRO_Y 2 +#define ADIS16400_SCAN_GYRO_Z 3 +#define ADIS16400_SCAN_ACC_X 4 +#define ADIS16400_SCAN_ACC_Y 5 +#define ADIS16400_SCAN_ACC_Z 6 +#define ADIS16400_SCAN_MAGN_X 7 +#define ADIS16400_SCAN_MAGN_Y 8 +#define ADIS16400_SCAN_MAGN_Z 9 +#define ADIS16400_SCAN_TEMP 10 +#define ADIS16400_SCAN_ADC_0 11 void adis16400_remove_trigger(struct iio_dev *indio_dev); int adis16400_probe_trigger(struct iio_dev *indio_dev); |