Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging:iio:events: use IIO_<TYPE> and IIO_MOD_<> instead of IIO_EV_CLASS_<TYPE> etc 



The original definitions were duplicated to reduce tree churn during introduction of chan_spec
registration.  Now there is no point in maintaining the two sets of definitions.

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent df9c1c42

drivers/staging/iio/accel/lis3l02dq_core.c

+12 −12
Original line number Diff line number Diff line
@@ -452,54 +452,54 @@ static irqreturn_t lis3l02dq_event_handler(int irq, void *private) 


	if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_HIGH)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_Z,

						  IIO_MOD_Z,

						  IIO_EV_TYPE_THRESH,

						  IIO_EV_DIR_RISING),

			       timestamp);



	if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_LOW)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_Z,

						  IIO_MOD_Z,

						  IIO_EV_TYPE_THRESH,

						  IIO_EV_DIR_FALLING),

			       timestamp);



	if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Y_HIGH)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_Y,

						  IIO_MOD_Y,

						  IIO_EV_TYPE_THRESH,

						  IIO_EV_DIR_RISING),

			       timestamp);



	if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Y_LOW)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_Y,

						  IIO_MOD_Y,

						  IIO_EV_TYPE_THRESH,

						  IIO_EV_DIR_FALLING),

			       timestamp);



	if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_X_HIGH)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_X,

						  IIO_MOD_X,

						  IIO_EV_TYPE_THRESH,

						  IIO_EV_DIR_RISING),

			       timestamp);



	if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_X_LOW)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_X,

						  IIO_MOD_X,

						  IIO_EV_TYPE_THRESH,

						  IIO_EV_DIR_FALLING),

			       timestamp);

drivers/staging/iio/accel/sca3000_core.c

+8 −8
Original line number Diff line number Diff line
@@ -815,36 +815,36 @@ static irqreturn_t sca3000_event_handler(int irq, void *private) 


	if (val & SCA3000_INT_STATUS_FREE_FALL)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_X_AND_Y_AND_Z,

						  IIO_MOD_X_AND_Y_AND_Z,

						  IIO_EV_TYPE_MAG,

						  IIO_EV_DIR_FALLING),

			       last_timestamp);



	if (val & SCA3000_INT_STATUS_Y_TRIGGER)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_Y,

						  IIO_MOD_Y,

						  IIO_EV_TYPE_MAG,

						  IIO_EV_DIR_RISING),

			       last_timestamp);



	if (val & SCA3000_INT_STATUS_X_TRIGGER)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_X,

						  IIO_MOD_X,

						  IIO_EV_TYPE_MAG,

						  IIO_EV_DIR_RISING),

			       last_timestamp);



	if (val & SCA3000_INT_STATUS_Z_TRIGGER)

		iio_push_event(indio_dev, 0,

			       IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL,

			       IIO_MOD_EVENT_CODE(IIO_ACCEL,

						  0,

						  IIO_EV_MOD_Z,

						  IIO_MOD_Z,

						  IIO_EV_TYPE_MAG,

						  IIO_EV_DIR_RISING),

			       last_timestamp);

drivers/staging/iio/adc/ad7150.c

+4 −4
Original line number Diff line number Diff line
@@ -654,14 +654,14 @@ static irqreturn_t ad7150_event_handler(int irq, void *private) 


	if ((int_status & AD7150_STATUS_OUT1) && !(chip->old_state & AD7150_STATUS_OUT1))

		iio_push_event(indio_dev, 0,

			       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,

			       IIO_UNMOD_EVENT_CODE(IIO_IN,

						    0,

						    IIO_EV_TYPE_THRESH,

						    IIO_EV_DIR_RISING),

				timestamp);

	else if ((!(int_status & AD7150_STATUS_OUT1)) && (chip->old_state & AD7150_STATUS_OUT1))

		iio_push_event(indio_dev, 0,

			       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,

			       IIO_UNMOD_EVENT_CODE(IIO_IN,

						    0,

						    IIO_EV_TYPE_THRESH,

						    IIO_EV_DIR_FALLING),
@@ -669,14 +669,14 @@ static irqreturn_t ad7150_event_handler(int irq, void *private) 


	if ((int_status & AD7150_STATUS_OUT2) && !(chip->old_state & AD7150_STATUS_OUT2))

		iio_push_event(indio_dev, 0,

			       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,

			       IIO_UNMOD_EVENT_CODE(IIO_IN,

						    1,

						    IIO_EV_TYPE_THRESH,

						    IIO_EV_DIR_RISING),

			       timestamp);

	else if ((!(int_status & AD7150_STATUS_OUT2)) && (chip->old_state & AD7150_STATUS_OUT2))

		iio_push_event(indio_dev, 0,

			       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,

			       IIO_UNMOD_EVENT_CODE(IIO_IN,

						    1,

						    IIO_EV_TYPE_THRESH,

						    IIO_EV_DIR_FALLING),

drivers/staging/iio/adc/ad7816.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static const struct attribute_group ad7816_attribute_group = { 
 * temperature bound events

 */



#define IIO_EVENT_CODE_AD7816_OTI IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_TEMP, \

#define IIO_EVENT_CODE_AD7816_OTI IIO_UNMOD_EVENT_CODE(IIO_TEMP,	\

						       0,		\

						       IIO_EV_TYPE_THRESH, \

						       IIO_EV_DIR_FALLING)

drivers/staging/iio/adc/ad799x_core.c

+2 −2
Original line number Diff line number Diff line
@@ -335,11 +335,11 @@ static irqreturn_t ad799x_event_handler(int irq, void *private) 
		if (status & (1 << i))

			iio_push_event(indio_dev, 0,

				       i & 0x1 ?

				       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,

				       IIO_UNMOD_EVENT_CODE(IIO_IN,

							    (i >> 1),

							    IIO_EV_TYPE_THRESH,

							    IIO_EV_DIR_RISING) :

				       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,

				       IIO_UNMOD_EVENT_CODE(IIO_IN,

							    (i >> 1),

							    IIO_EV_TYPE_THRESH,

							    IIO_EV_DIR_FALLING),