Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 74 deletions
drivers/staging/iio/accel/lis3l02dq_core.c
View file @ c4b14d99
...@@ -452,54 +452,54 @@ static irqreturn_t lis3l02dq_event_handler(int irq, void *private) ...@@ -452,54 +452,54 @@ static irqreturn_t lis3l02dq_event_handler(int irq, void *private)
if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_HIGH) if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_HIGH)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_Z, IIO_MOD_Z,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
timestamp); timestamp);
if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_LOW) if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Z_LOW)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_Z, IIO_MOD_Z,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_FALLING), IIO_EV_DIR_FALLING),
timestamp); timestamp);
if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Y_HIGH) if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Y_HIGH)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_Y, IIO_MOD_Y,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
timestamp); timestamp);
if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Y_LOW) if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_Y_LOW)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_Y, IIO_MOD_Y,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_FALLING), IIO_EV_DIR_FALLING),
timestamp); timestamp);
if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_X_HIGH) if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_X_HIGH)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_X, IIO_MOD_X,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
timestamp); timestamp);
if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_X_LOW) if (t & LIS3L02DQ_REG_WAKE_UP_SRC_INTERRUPT_X_LOW)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_X, IIO_MOD_X,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_FALLING), IIO_EV_DIR_FALLING),
timestamp); timestamp);
......
drivers/staging/iio/accel/sca3000_core.c
View file @ c4b14d99
...@@ -815,36 +815,36 @@ static irqreturn_t sca3000_event_handler(int irq, void *private) ...@@ -815,36 +815,36 @@ static irqreturn_t sca3000_event_handler(int irq, void *private)
if (val & SCA3000_INT_STATUS_FREE_FALL) if (val & SCA3000_INT_STATUS_FREE_FALL)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_X_AND_Y_AND_Z, IIO_MOD_X_AND_Y_AND_Z,
IIO_EV_TYPE_MAG, IIO_EV_TYPE_MAG,
IIO_EV_DIR_FALLING), IIO_EV_DIR_FALLING),
last_timestamp); last_timestamp);
if (val & SCA3000_INT_STATUS_Y_TRIGGER) if (val & SCA3000_INT_STATUS_Y_TRIGGER)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_Y, IIO_MOD_Y,
IIO_EV_TYPE_MAG, IIO_EV_TYPE_MAG,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
last_timestamp); last_timestamp);
if (val & SCA3000_INT_STATUS_X_TRIGGER) if (val & SCA3000_INT_STATUS_X_TRIGGER)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_X, IIO_MOD_X,
IIO_EV_TYPE_MAG, IIO_EV_TYPE_MAG,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
last_timestamp); last_timestamp);
if (val & SCA3000_INT_STATUS_Z_TRIGGER) if (val & SCA3000_INT_STATUS_Z_TRIGGER)
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_MOD_EVENT_CODE(IIO_EV_CLASS_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
IIO_EV_MOD_Z, IIO_MOD_Z,
IIO_EV_TYPE_MAG, IIO_EV_TYPE_MAG,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
last_timestamp); last_timestamp);
......
drivers/staging/iio/adc/ad7150.c
View file @ c4b14d99
...@@ -654,14 +654,14 @@ static irqreturn_t ad7150_event_handler(int irq, void *private) ...@@ -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)) if ((int_status & AD7150_STATUS_OUT1) && !(chip->old_state & AD7150_STATUS_OUT1))
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, IIO_UNMOD_EVENT_CODE(IIO_IN,
0, 0,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
timestamp); timestamp);
else if ((!(int_status & AD7150_STATUS_OUT1)) && (chip->old_state & AD7150_STATUS_OUT1)) else if ((!(int_status & AD7150_STATUS_OUT1)) && (chip->old_state & AD7150_STATUS_OUT1))
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, IIO_UNMOD_EVENT_CODE(IIO_IN,
0, 0,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_FALLING), IIO_EV_DIR_FALLING),
...@@ -669,14 +669,14 @@ static irqreturn_t ad7150_event_handler(int irq, void *private) ...@@ -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)) if ((int_status & AD7150_STATUS_OUT2) && !(chip->old_state & AD7150_STATUS_OUT2))
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, IIO_UNMOD_EVENT_CODE(IIO_IN,
1, 1,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
timestamp); timestamp);
else if ((!(int_status & AD7150_STATUS_OUT2)) && (chip->old_state & AD7150_STATUS_OUT2)) else if ((!(int_status & AD7150_STATUS_OUT2)) && (chip->old_state & AD7150_STATUS_OUT2))
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, IIO_UNMOD_EVENT_CODE(IIO_IN,
1, 1,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_FALLING), IIO_EV_DIR_FALLING),
......
drivers/staging/iio/adc/ad7816.c
View file @ c4b14d99
...@@ -246,7 +246,7 @@ static const struct attribute_group ad7816_attribute_group = { ...@@ -246,7 +246,7 @@ static const struct attribute_group ad7816_attribute_group = {
* temperature bound events * 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, \ 0, \
IIO_EV_TYPE_THRESH, \ IIO_EV_TYPE_THRESH, \
IIO_EV_DIR_FALLING) IIO_EV_DIR_FALLING)
......
drivers/staging/iio/adc/ad799x_core.c
View file @ c4b14d99
...@@ -335,11 +335,11 @@ static irqreturn_t ad799x_event_handler(int irq, void *private) ...@@ -335,11 +335,11 @@ static irqreturn_t ad799x_event_handler(int irq, void *private)
if (status & (1 << i)) if (status & (1 << i))
iio_push_event(indio_dev, 0, iio_push_event(indio_dev, 0,
i & 0x1 ? i & 0x1 ?
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, IIO_UNMOD_EVENT_CODE(IIO_IN,
(i >> 1), (i >> 1),
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING) : IIO_EV_DIR_RISING) :
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, IIO_UNMOD_EVENT_CODE(IIO_IN,
(i >> 1), (i >> 1),
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_FALLING), IIO_EV_DIR_FALLING),
......
drivers/staging/iio/adc/adt75.c
View file @ c4b14d99
...@@ -257,7 +257,7 @@ static const struct attribute_group adt75_attribute_group = { ...@@ -257,7 +257,7 @@ static const struct attribute_group adt75_attribute_group = {
* temperature bound events * temperature bound events
*/ */
#define IIO_EVENT_CODE_ADT75_OTI IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_TEMP, \ #define IIO_EVENT_CODE_ADT75_OTI IIO_UNMOD_EVENT_CODE(IIO_TEMP, \
0, \ 0, \
IIO_EV_TYPE_THRESH, \ IIO_EV_TYPE_THRESH, \
IIO_EV_DIR_FALLING) IIO_EV_DIR_FALLING)
......
drivers/staging/iio/adc/max1363_core.c
View file @ c4b14d99
...@@ -591,22 +591,14 @@ static int max1363_write_thresh(struct iio_dev *indio_dev, ...@@ -591,22 +591,14 @@ static int max1363_write_thresh(struct iio_dev *indio_dev,
} }
static const int max1363_event_codes[] = { static const int max1363_event_codes[] = {
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 0, IIO_UNMOD_EVENT_CODE(IIO_IN, 0, IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING), IIO_UNMOD_EVENT_CODE(IIO_IN, 1, IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 1, IIO_UNMOD_EVENT_CODE(IIO_IN, 2, IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING), IIO_UNMOD_EVENT_CODE(IIO_IN, 3, IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 2, IIO_UNMOD_EVENT_CODE(IIO_IN, 0, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING), IIO_UNMOD_EVENT_CODE(IIO_IN, 1, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 3, IIO_UNMOD_EVENT_CODE(IIO_IN, 2, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING), IIO_UNMOD_EVENT_CODE(IIO_IN, 3, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 0,
IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 1,
IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 2,
IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 3,
IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
}; };
static irqreturn_t max1363_event_handler(int irq, void *private) static irqreturn_t max1363_event_handler(int irq, void *private)
......
drivers/staging/iio/dac/ad5504.c
View file @ c4b14d99
...@@ -251,7 +251,7 @@ static struct attribute_group ad5504_ev_attribute_group = { ...@@ -251,7 +251,7 @@ static struct attribute_group ad5504_ev_attribute_group = {
static irqreturn_t ad5504_event_handler(int irq, void *private) static irqreturn_t ad5504_event_handler(int irq, void *private)
{ {
iio_push_event(private, 0, iio_push_event(private, 0,
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_TEMP, IIO_UNMOD_EVENT_CODE(IIO_TEMP,
0, 0,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
......
drivers/staging/iio/iio.h
View file @ c4b14d99
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
* Currently assumes nano seconds. * Currently assumes nano seconds.
*/ */
/* naughty temporary hack to match these against the event version
- need to flattern these together */
enum iio_chan_type { enum iio_chan_type {
/* real channel types */ /* real channel types */
IIO_IN, IIO_IN,
......
drivers/staging/iio/light/tsl2563.c
View file @ c4b14d99
...@@ -596,7 +596,7 @@ static irqreturn_t tsl2563_event_handler(int irq, void *private) ...@@ -596,7 +596,7 @@ static irqreturn_t tsl2563_event_handler(int irq, void *private)
struct tsl2563_chip *chip = iio_priv(dev_info); struct tsl2563_chip *chip = iio_priv(dev_info);
iio_push_event(dev_info, 0, iio_push_event(dev_info, 0,
IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_LIGHT, IIO_UNMOD_EVENT_CODE(IIO_LIGHT,
0, 0,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_EITHER), IIO_EV_DIR_EITHER),
......
drivers/staging/iio/sysfs.h
View file @ c4b14d99
...@@ -114,28 +114,6 @@ struct iio_const_attr { ...@@ -114,28 +114,6 @@ struct iio_const_attr {
#define IIO_CONST_ATTR_TEMP_SCALE(_string) \ #define IIO_CONST_ATTR_TEMP_SCALE(_string) \
IIO_CONST_ATTR(temp_scale, _string) IIO_CONST_ATTR(temp_scale, _string)
/* must match our channel defs */
#define IIO_EV_CLASS_IN IIO_IN
#define IIO_EV_CLASS_IN_DIFF IIO_IN_DIFF
#define IIO_EV_CLASS_ACCEL IIO_ACCEL
#define IIO_EV_CLASS_GYRO IIO_GYRO
#define IIO_EV_CLASS_MAGN IIO_MAGN
#define IIO_EV_CLASS_LIGHT IIO_LIGHT
#define IIO_EV_CLASS_PROXIMITY IIO_PROXIMITY
#define IIO_EV_CLASS_TEMP IIO_TEMP
#define IIO_EV_MOD_X IIO_MOD_X
#define IIO_EV_MOD_Y IIO_MOD_Y
#define IIO_EV_MOD_Z IIO_MOD_Z
#define IIO_EV_MOD_X_AND_Y IIO_MOD_X_AND_Y
#define IIO_EV_MOD_X_ANX_Z IIO_MOD_X_AND_Z
#define IIO_EV_MOD_Y_AND_Z IIO_MOD_Y_AND_Z
#define IIO_EV_MOD_X_AND_Y_AND_Z IIO_MOD_X_AND_Y_AND_Z
#define IIO_EV_MOD_X_OR_Y IIO_MOD_X_OR_Y
#define IIO_EV_MOD_X_OR_Z IIO_MOD_X_OR_Z
#define IIO_EV_MOD_Y_OR_Z IIO_MOD_Y_OR_Z
#define IIO_EV_MOD_X_OR_Y_OR_Z IIO_MOD_X_OR_Y_OR_Z
#define IIO_EV_TYPE_THRESH 0 #define IIO_EV_TYPE_THRESH 0
#define IIO_EV_TYPE_MAG 1 #define IIO_EV_TYPE_MAG 1
#define IIO_EV_TYPE_ROC 2 #define IIO_EV_TYPE_ROC 2
...@@ -160,10 +138,6 @@ struct iio_const_attr { ...@@ -160,10 +138,6 @@ struct iio_const_attr {
#define IIO_UNMOD_EVENT_CODE(channelclass, number, type, direction) \ #define IIO_UNMOD_EVENT_CODE(channelclass, number, type, direction) \
IIO_EVENT_CODE(channelclass, 0, number, 0, type, direction) IIO_EVENT_CODE(channelclass, 0, number, 0, type, direction)
#define IIO_BUFFER_EVENT_CODE(code) \
(IIO_EV_CLASS_BUFFER | (code << 8))
#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 24) & 0xf) #define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 24) & 0xf)
/* Event code number extraction depends on which type of event we have. /* Event code number extraction depends on which type of event we have.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7