1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index 3bec9220df04..bfec313492b3 100644
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -447,14 +447,14 @@ static const struct iio_chan_spec_ext_info bma180_ext_info[] = {
        { },
 };
-#define BMA180_CHANNEL(_index) {                                        \
+#define BMA180_CHANNEL(_axis) {                                 \
        .type = IIO_ACCEL,                                              \
-        .indexed = 1,                                                   \
+        .modified = 1,                                                  \
-        .channel = (_index),                                            \
+        .channel2 = IIO_MOD_##_axis,                                    \
        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |                  \
                BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY),       \
        .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),           \
-        .scan_index = (_index),                                         \
+        .scan_index = AXIS_##_axis,                                     \
        .scan_type = {                                                  \
                .sign = 's',                                            \
                .realbits = 14,                                         \
@@ -465,10 +465,10 @@ static const struct iio_chan_spec_ext_info bma180_ext_info[] = {
 }
 static const struct iio_chan_spec bma180_channels[] = {
-        BMA180_CHANNEL(AXIS_X),
+        BMA180_CHANNEL(X),
-        BMA180_CHANNEL(AXIS_Y),
+        BMA180_CHANNEL(Y),
-        BMA180_CHANNEL(AXIS_Z),
+        BMA180_CHANNEL(Z),
-        IIO_CHAN_SOFT_TIMESTAMP(4),
+        IIO_CHAN_SOFT_TIMESTAMP(3),
 };
 static irqreturn_t bma180_trigger_handler(int irq, void *p)

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c index 3bec9220df04..bfec313492b3 100644 --- a/drivers/iio/accel/bma180.c +++ b/drivers/iio/accel/bma180.c
@@ -447,14 +447,14 @@ static const struct iio_chan_spec_ext_info bma180_ext_info[] = {
447	{ },	447	{ },
448	};	448	};
449		449
450	#define BMA180_CHANNEL(_index) { \	450	#define BMA180_CHANNEL(_axis) { \
451	.type = IIO_ACCEL, \	451	.type = IIO_ACCEL, \
452	.indexed = 1, \	452	.modified = 1, \
453	.channel = (_index), \	453	.channel2 = IIO_MOD_##_axis, \
454	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) \| \	454	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) \| \
455	BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY), \	455	BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY), \
456	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \	456	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
457	.scan_index = (_index), \	457	.scan_index = AXIS_##_axis, \
458	.scan_type = { \	458	.scan_type = { \
459	.sign = 's', \	459	.sign = 's', \
460	.realbits = 14, \	460	.realbits = 14, \
@@ -465,10 +465,10 @@ static const struct iio_chan_spec_ext_info bma180_ext_info[] = {
465	}	465	}
466		466
467	static const struct iio_chan_spec bma180_channels[] = {	467	static const struct iio_chan_spec bma180_channels[] = {
468	BMA180_CHANNEL(AXIS_X),	468	BMA180_CHANNEL(X),
469	BMA180_CHANNEL(AXIS_Y),	469	BMA180_CHANNEL(Y),
470	BMA180_CHANNEL(AXIS_Z),	470	BMA180_CHANNEL(Z),
471	IIO_CHAN_SOFT_TIMESTAMP(4),	471	IIO_CHAN_SOFT_TIMESTAMP(3),
472	};	472	};
473		473
474	static irqreturn_t bma180_trigger_handler(int irq, void *p)	474	static irqreturn_t bma180_trigger_handler(int irq, void *p)