tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio:imu:adis16480 move to info_mask_(shared_by_type/separate)
The original info_mask is going away in favour of the broken out versions.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
+16
-16
+16
-16
drivers/iio/imu/adis16480.c
+16
-16
drivers/iio/imu/adis16480.c
···
591
591
}
592
592
}
593
593
594
-
#define ADIS16480_MOD_CHANNEL(_type, _mod, _address, _si, _info, _bits) \
594
+
#define ADIS16480_MOD_CHANNEL(_type, _mod, _address, _si, _info_sep, _bits) \
595
595
{ \
596
596
.type = (_type), \
597
597
.modified = 1, \
598
598
.channel2 = (_mod), \
599
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
600
-
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
601
-
IIO_CHAN_INFO_SCALE_SHARED_BIT | \
602
-
_info, \
599
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
600
+
BIT(IIO_CHAN_INFO_CALIBBIAS) | \
601
+
_info_sep, \
602
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
603
603
.address = (_address), \
604
604
.scan_index = (_si), \
605
605
.scan_type = { \
···
613
613
#define ADIS16480_GYRO_CHANNEL(_mod) \
614
614
ADIS16480_MOD_CHANNEL(IIO_ANGL_VEL, IIO_MOD_ ## _mod, \
615
615
ADIS16480_REG_ ## _mod ## _GYRO_OUT, ADIS16480_SCAN_GYRO_ ## _mod, \
616
-
IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT | \
617
-
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, \
616
+
BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY) | \
617
+
BIT(IIO_CHAN_INFO_CALIBSCALE), \
618
618
32)
619
619
620
620
#define ADIS16480_ACCEL_CHANNEL(_mod) \
621
621
ADIS16480_MOD_CHANNEL(IIO_ACCEL, IIO_MOD_ ## _mod, \
622
622
ADIS16480_REG_ ## _mod ## _ACCEL_OUT, ADIS16480_SCAN_ACCEL_ ## _mod, \
623
-
IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT | \
624
-
IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT, \
623
+
BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY) | \
624
+
BIT(IIO_CHAN_INFO_CALIBSCALE), \
625
625
32)
626
626
627
627
#define ADIS16480_MAGN_CHANNEL(_mod) \
628
628
ADIS16480_MOD_CHANNEL(IIO_MAGN, IIO_MOD_ ## _mod, \
629
629
ADIS16480_REG_ ## _mod ## _MAGN_OUT, ADIS16480_SCAN_MAGN_ ## _mod, \
630
-
IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT, \
630
+
BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY), \
631
631
16)
632
632
633
633
#define ADIS16480_PRESSURE_CHANNEL() \
···
635
635
.type = IIO_PRESSURE, \
636
636
.indexed = 1, \
637
637
.channel = 0, \
638
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
639
-
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
640
-
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
638
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
639
+
BIT(IIO_CHAN_INFO_CALIBBIAS) | \
640
+
BIT(IIO_CHAN_INFO_SCALE), \
641
641
.address = ADIS16480_REG_BAROM_OUT, \
642
642
.scan_index = ADIS16480_SCAN_BARO, \
643
643
.scan_type = { \
···
652
652
.type = IIO_TEMP, \
653
653
.indexed = 1, \
654
654
.channel = 0, \
655
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
656
-
IIO_CHAN_INFO_SCALE_SEPARATE_BIT | \
657
-
IIO_CHAN_INFO_OFFSET_SEPARATE_BIT, \
655
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
656
+
BIT(IIO_CHAN_INFO_SCALE) | \
657
+
BIT(IIO_CHAN_INFO_OFFSET), \
658
658
.address = ADIS16480_REG_TEMP_OUT, \
659
659
.scan_index = ADIS16480_SCAN_TEMP, \
660
660
.scan_type = { \