Commit 69584bd6 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

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: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2662051e

drivers/staging/iio/accel/adis16209.h

+9 −10
Original line number Diff line number Diff line
@@ -126,16 +126,15 @@ struct adis16209_state { 
int adis16209_set_irq(struct device *dev, bool enable);



#ifdef CONFIG_IIO_RING_BUFFER

enum adis16209_scan {

	ADIS16209_SCAN_SUPPLY,

	ADIS16209_SCAN_ACC_X,

	ADIS16209_SCAN_ACC_Y,

	ADIS16209_SCAN_AUX_ADC,

	ADIS16209_SCAN_TEMP,

	ADIS16209_SCAN_INCLI_X,

	ADIS16209_SCAN_INCLI_Y,

	ADIS16209_SCAN_ROT,

};



#define ADIS16209_SCAN_SUPPLY	0

#define ADIS16209_SCAN_ACC_X	1

#define ADIS16209_SCAN_ACC_Y	2

#define ADIS16209_SCAN_AUX_ADC	3

#define ADIS16209_SCAN_TEMP	4

#define ADIS16209_SCAN_INCLI_X	5

#define ADIS16209_SCAN_INCLI_Y	6

#define ADIS16209_SCAN_ROT	7



void adis16209_remove_trigger(struct iio_dev *indio_dev);

int adis16209_probe_trigger(struct iio_dev *indio_dev);

drivers/staging/iio/accel/adis16240.h

+6 −8
Original line number Diff line number Diff line
@@ -153,14 +153,12 @@ int adis16240_set_irq(struct device *dev, bool enable); 
 * filling. This may change!

 */



enum adis16240_scan {

	ADIS16240_SCAN_SUPPLY,

	ADIS16240_SCAN_ACC_X,

	ADIS16240_SCAN_ACC_Y,

	ADIS16240_SCAN_ACC_Z,

	ADIS16240_SCAN_AUX_ADC,

	ADIS16240_SCAN_TEMP,

};

#define ADIS16240_SCAN_SUPPLY	0

#define ADIS16240_SCAN_ACC_X	1

#define ADIS16240_SCAN_ACC_Y	2

#define ADIS16240_SCAN_ACC_Z	3

#define ADIS16240_SCAN_AUX_ADC	4

#define ADIS16240_SCAN_TEMP	5



void adis16240_remove_trigger(struct iio_dev *indio_dev);

int adis16240_probe_trigger(struct iio_dev *indio_dev);

drivers/staging/iio/gyro/adis16260.h

+5 −7
Original line number Diff line number Diff line
@@ -111,13 +111,11 @@ int adis16260_set_irq(struct device *dev, bool enable); 
 * filling. This may change!

 */



enum adis16260_scan {

	ADIS16260_SCAN_SUPPLY,

	ADIS16260_SCAN_GYRO,

	ADIS16260_SCAN_AUX_ADC,

	ADIS16260_SCAN_TEMP,

	ADIS16260_SCAN_ANGL,

};

#define ADIS16260_SCAN_SUPPLY	0

#define ADIS16260_SCAN_GYRO	1

#define ADIS16260_SCAN_AUX_ADC	2

#define ADIS16260_SCAN_TEMP	3

#define ADIS16260_SCAN_ANGL	4



void adis16260_remove_trigger(struct iio_dev *indio_dev);

int adis16260_probe_trigger(struct iio_dev *indio_dev);

drivers/staging/iio/imu/adis16300.h

+9 −11
Original line number Diff line number Diff line
@@ -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);

drivers/staging/iio/imu/adis16350.h

+11 −13
Original line number Diff line number Diff line
@@ -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);