tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio:imu:adis16400 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>
+25
-24
+25
-24
drivers/iio/imu/adis16400_core.c
+25
-24
drivers/iio/imu/adis16400_core.c
···
484
484
.indexed = 1, \
485
485
.channel = 0, \
486
486
.extend_name = name, \
487
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
488
-
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
487
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
488
+
BIT(IIO_CHAN_INFO_SCALE), \
489
489
.address = (addr), \
490
490
.scan_index = (si), \
491
491
.scan_type = { \
···
507
507
.type = IIO_ANGL_VEL, \
508
508
.modified = 1, \
509
509
.channel2 = IIO_MOD_ ## mod, \
510
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
511
-
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
512
-
IIO_CHAN_INFO_SCALE_SHARED_BIT | \
513
-
IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT, \
510
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
511
+
BIT(IIO_CHAN_INFO_CALIBBIAS), \
512
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \
513
+
BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY), \
514
514
.address = addr, \
515
515
.scan_index = ADIS16400_SCAN_GYRO_ ## mod, \
516
516
.scan_type = { \
···
526
526
.type = IIO_ACCEL, \
527
527
.modified = 1, \
528
528
.channel2 = IIO_MOD_ ## mod, \
529
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
530
-
IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
531
-
IIO_CHAN_INFO_SCALE_SHARED_BIT | \
532
-
IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT, \
529
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
530
+
BIT(IIO_CHAN_INFO_CALIBBIAS), \
531
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \
532
+
BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY), \
533
533
.address = (addr), \
534
534
.scan_index = ADIS16400_SCAN_ACC_ ## mod, \
535
535
.scan_type = { \
···
545
545
.type = IIO_MAGN, \
546
546
.modified = 1, \
547
547
.channel2 = IIO_MOD_ ## mod, \
548
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
549
-
IIO_CHAN_INFO_SCALE_SHARED_BIT | \
550
-
IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT, \
548
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
549
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \
550
+
BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY), \
551
551
.address = (addr), \
552
552
.scan_index = ADIS16400_SCAN_MAGN_ ## mod, \
553
553
.scan_type = { \
···
568
568
.indexed = 1, \
569
569
.channel = 0, \
570
570
.extend_name = ADIS16400_MOD_TEMP_NAME_ ## mod, \
571
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
572
-
IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | \
573
-
IIO_CHAN_INFO_SCALE_SEPARATE_BIT | \
574
-
IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT, \
571
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
572
+
BIT(IIO_CHAN_INFO_OFFSET) | \
573
+
BIT(IIO_CHAN_INFO_SCALE), \
574
+
.info_mask_shared_by_type = \
575
+
BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY), \
575
576
.address = (addr), \
576
577
.scan_index = ADIS16350_SCAN_TEMP_ ## mod, \
577
578
.scan_type = { \
···
588
587
.type = IIO_TEMP, \
589
588
.indexed = 1, \
590
589
.channel = 0, \
591
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
592
-
IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | \
593
-
IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
590
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
591
+
BIT(IIO_CHAN_INFO_OFFSET) | \
592
+
BIT(IIO_CHAN_INFO_SCALE), \
594
593
.address = (addr), \
595
594
.scan_index = ADIS16350_SCAN_TEMP_X, \
596
595
.scan_type = { \
···
606
605
.type = IIO_INCLI, \
607
606
.modified = 1, \
608
607
.channel2 = IIO_MOD_ ## mod, \
609
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
610
-
IIO_CHAN_INFO_SCALE_SHARED_BIT, \
608
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
609
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
611
610
.address = (addr), \
612
611
.scan_index = ADIS16300_SCAN_INCLI_ ## mod, \
613
612
.scan_type = { \
···
647
646
ADIS16400_MAGN_CHAN(Z, ADIS16400_ZMAGN_OUT, 16),
648
647
{
649
648
.type = IIO_PRESSURE,
650
-
.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
651
-
IIO_CHAN_INFO_SCALE_SHARED_BIT,
649
+
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
650
+
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
652
651
.address = ADIS16448_BARO_OUT,
653
652
.scan_index = ADIS16400_SCAN_BARO,
654
653
.scan_type = IIO_ST('s', 16, 16, 0),