iio: imu: st_lsm6dsx: add event spec parameter to iio_chan_spec initializer

In preparation for adding support for more event sources, add to the
ST_LSM6DSX_CHANNEL_ACC() iio_chan_spec initializer macro an iio_event_spec
array argument, so that this macro can be used with different arrays by
sensors that support different event sources; change the st_lsm6dsx_event
struct declaration to an array (renamed as st_lsm6dsx_ev_motion) so that it
can be passed to the macro (and opportunistically move it from the header
file where it does not belong to the C file where it is used).
In addition, remove from this macro the channel type parameter and
hard-code IIO_ACCEL in the macro definition, since all callers use
IIO_ACCEL as channel type argument.

Signed-off-by: Francesco Lavra <flavra@baylibre.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
index 64c03a00456f2cfababbd9317b2fe9fdac6ce88f..555b826185a4e01bcbe4b048f6a5cdd182ad728f 100644 (file)
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
@@ -81,9 +81,9 @@ enum st_lsm6dsx_hw_id {
 #define ST_LSM6DSX_SHIFT_VAL(val, mask)        (((val) << __ffs(mask)) & (mask))
 #define st_lsm6dsx_field_get(mask, reg)        ((reg & mask) >> __ffs(mask))
 
-#define ST_LSM6DSX_CHANNEL_ACC(chan_type, addr, mod, scan_idx)         \
+#define ST_LSM6DSX_CHANNEL_ACC(addr, mod, scan_idx, events)            \
 {                                                                      \
-       .type = chan_type,                                              \
+       .type = IIO_ACCEL,                                              \
        .address = addr,                                                \
        .modified = 1,                                                  \
        .channel2 = mod,                                                \
@@ -97,9 +97,9 @@ enum st_lsm6dsx_hw_id {
                .storagebits = 16,                                      \
                .endianness = IIO_LE,                                   \
        },                                                              \
-       .event_spec = &st_lsm6dsx_event,                                \
+       .event_spec = events,                                           \
+       .num_event_specs = ARRAY_SIZE(events),                          \
        .ext_info = st_lsm6dsx_ext_info,                                \
-       .num_event_specs = 1,                                           \
 }
 
 #define ST_LSM6DSX_CHANNEL(chan_type, addr, mod, scan_idx)             \
@@ -486,13 +486,6 @@ struct st_lsm6dsx_hw {
        } scan[ST_LSM6DSX_ID_MAX];
 };
 
-static __maybe_unused const struct iio_event_spec st_lsm6dsx_event = {
-       .type = IIO_EV_TYPE_THRESH,
-       .dir = IIO_EV_DIR_EITHER,
-       .mask_separate = BIT(IIO_EV_INFO_VALUE) |
-                        BIT(IIO_EV_INFO_ENABLE)
-};
-
 static __maybe_unused const unsigned long st_lsm6dsx_available_scan_masks[] = {
        0x7, 0x0,
 };

diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
index 7f9f6ba52d48d98985f02df88455f46451ddec31..f28607a31f18bd8025e8420c767a0f71ae661aec 100644 (file)
--- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
+++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
@@ -94,10 +94,19 @@
 
 #define ST_LSM6DSX_REG_WHOAMI_ADDR             0x0f
 
+static const struct iio_event_spec st_lsm6dsx_ev_motion[] = {
+       {
+               .type = IIO_EV_TYPE_THRESH,
+               .dir = IIO_EV_DIR_EITHER,
+               .mask_separate = BIT(IIO_EV_INFO_VALUE) |
+                                BIT(IIO_EV_INFO_ENABLE),
+       },
+};
+
 static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = {
-       ST_LSM6DSX_CHANNEL_ACC(IIO_ACCEL, 0x28, IIO_MOD_X, 0),
-       ST_LSM6DSX_CHANNEL_ACC(IIO_ACCEL, 0x2a, IIO_MOD_Y, 1),
-       ST_LSM6DSX_CHANNEL_ACC(IIO_ACCEL, 0x2c, IIO_MOD_Z, 2),
+       ST_LSM6DSX_CHANNEL_ACC(0x28, IIO_MOD_X, 0, st_lsm6dsx_ev_motion),
+       ST_LSM6DSX_CHANNEL_ACC(0x2a, IIO_MOD_Y, 1, st_lsm6dsx_ev_motion),
+       ST_LSM6DSX_CHANNEL_ACC(0x2c, IIO_MOD_Z, 2, st_lsm6dsx_ev_motion),
        IIO_CHAN_SOFT_TIMESTAMP(3),
 };