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: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 83ec286c4777bf0749f0d82ed6664f9c4f2aeb1b..7f946aa014044dc4cd4b7f99a8f8a724b778805a 100644 (file)
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -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);

diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 22c38c328da0e0f7fcb7219506c3508cbe40f40e..d5684fc29cdfa81fd178e36f187461144b6e3fd4 100644 (file)
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -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);

diff --git a/drivers/staging/iio/adc/ad7150.c b/drivers/staging/iio/adc/ad7150.c
index 917fb2fa0de921403197981d9ce4e9869924402e..5a1e15f6aec9c896c1863bf8a6fa293a22545c50 100644 (file)
--- a/drivers/staging/iio/adc/ad7150.c
+++ b/drivers/staging/iio/adc/ad7150.c
@@ -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),

diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
index 0c84217bde3ddd753fc2e3134701ccb537f620a2..3fa4bb34a432d624cad5dc7f69ad3cf2f60eb332 100644 (file)
--- a/drivers/staging/iio/adc/ad7816.c
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -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)

diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index d42d61d606390f7d24f2fb81ba9e98e5cfd8e16b..2438ed597e9f4496d50108a4528db290bc5e8557 100644 (file)
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -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),

diff --git a/drivers/staging/iio/adc/adt75.c b/drivers/staging/iio/adc/adt75.c
index 38f141de6a4be018054dfa424126df05c4232761..fc31cac7eae2e8465f2f79371025125fea11c0fb 100644 (file)
--- a/drivers/staging/iio/adc/adt75.c
+++ b/drivers/staging/iio/adc/adt75.c
@@ -257,7 +257,7 @@ static const struct attribute_group adt75_attribute_group = {
  * 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,                \
                                                      IIO_EV_TYPE_THRESH, \
                                                      IIO_EV_DIR_FALLING)

diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c
index 9525aec58730b385185b3ee304814abc9a0aa406..6896b4cddf3d97832a6b7b9a50d2cecfd585c2c5 100644 (file)
--- a/drivers/staging/iio/adc/max1363_core.c
+++ b/drivers/staging/iio/adc/max1363_core.c
@@ -591,22 +591,14 @@ static int max1363_write_thresh(struct iio_dev *indio_dev,
 }
 
 static const int max1363_event_codes[] = {
-       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 0,
-                            IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
-       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 1,
-                            IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
-       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 2,
-                            IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
-       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 3,
-                            IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
-       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),
+       IIO_UNMOD_EVENT_CODE(IIO_IN, 0, 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_IN, 2, 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_IN, 0, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
+       IIO_UNMOD_EVENT_CODE(IIO_IN, 1, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
+       IIO_UNMOD_EVENT_CODE(IIO_IN, 2, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
+       IIO_UNMOD_EVENT_CODE(IIO_IN, 3, IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
 };
 
 static irqreturn_t max1363_event_handler(int irq, void *private)

diff --git a/drivers/staging/iio/dac/ad5504.c b/drivers/staging/iio/dac/ad5504.c
index 88512dd6450f3f5332e7164635621bd3973b56ed..ba3d9b3154af3d5ff506be946f5551e317d8ee04 100644 (file)
--- a/drivers/staging/iio/dac/ad5504.c
+++ b/drivers/staging/iio/dac/ad5504.c
@@ -251,7 +251,7 @@ static struct attribute_group ad5504_ev_attribute_group = {
 static irqreturn_t ad5504_event_handler(int irq, void *private)
 {
        iio_push_event(private, 0,
-                      IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_TEMP,
+                      IIO_UNMOD_EVENT_CODE(IIO_TEMP,
                                            0,
                                            IIO_EV_TYPE_THRESH,
                                            IIO_EV_DIR_RISING),

diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index 61cfb26d193b9f8640267a5cfb31bffd34c76282..16abb3749f70e13107516464e57b33535caad34d 100644 (file)
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -23,8 +23,6 @@
  * Currently assumes nano seconds.
  */
 
-/* naughty temporary hack to match these against the event version
-   - need to flattern these together */
 enum iio_chan_type {
        /* real channel types */
        IIO_IN,

diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index bb96857f33f4d95012ca44a38f326bd48c639330..665a7441b2ee3cdd3e97c7045499effaafa50fd3 100644 (file)
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/drivers/staging/iio/light/tsl2563.c
@@ -596,7 +596,7 @@ static irqreturn_t tsl2563_event_handler(int irq, void *private)
        struct tsl2563_chip *chip = iio_priv(dev_info);
 
        iio_push_event(dev_info, 0,
-                      IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_LIGHT,
+                      IIO_UNMOD_EVENT_CODE(IIO_LIGHT,
                                            0,
                                            IIO_EV_TYPE_THRESH,
                                            IIO_EV_DIR_EITHER),

diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
index 56f4efbeb5de6929042955877bca1c30fd918998..bf34cfbd9c2b318b21701391b282f525ff5abf17 100644 (file)
--- a/drivers/staging/iio/sysfs.h
+++ b/drivers/staging/iio/sysfs.h
@@ -114,28 +114,6 @@ struct iio_const_attr {
 #define 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_MAG                        1
 #define IIO_EV_TYPE_ROC                        2
@@ -160,10 +138,6 @@ struct iio_const_attr {
 #define IIO_UNMOD_EVENT_CODE(channelclass, number, 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)
 
 /* Event code number extraction depends on which type of event we have.