Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 19a7c88d99c94e232e8dacb585ca359f0f0d94b6

Authored by Jonathan Cameron
1 parent e1865aa170
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 25 additions and 24 deletions Side-by-side Diff

drivers/iio/imu/adis16400_core.c
Diff comments   View file @ 19a7c88
... ... @@ -484,8 +484,8 @@
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,10 +507,10 @@
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,10 +526,10 @@
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,9 +545,9 @@
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,10 +568,11 @@
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 = { \
... ... @@ -587,9 +588,9 @@
587 588 .type = IIO_TEMP, \
588 589 .indexed = 1, \
589 590 .channel = 0, \
590   - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
591   - IIO_CHAN_INFO_OFFSET_SEPARATE_BIT | \
592   - IIO_CHAN_INFO_SCALE_SEPARATE_BIT, \
  591 + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
  592 + BIT(IIO_CHAN_INFO_OFFSET) | \
  593 + BIT(IIO_CHAN_INFO_SCALE), \
593 594 .address = (addr), \
594 595 .scan_index = ADIS16350_SCAN_TEMP_X, \
595 596 .scan_type = { \
... ... @@ -605,8 +606,8 @@
605 606 .type = IIO_INCLI, \
606 607 .modified = 1, \
607 608 .channel2 = IIO_MOD_ ## mod, \
608   - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | \
609   - IIO_CHAN_INFO_SCALE_SHARED_BIT, \
  609 + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
  610 + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
610 611 .address = (addr), \
611 612 .scan_index = ADIS16300_SCAN_INCLI_ ## mod, \
612 613 .scan_type = { \
... ... @@ -646,8 +647,8 @@
646 647 ADIS16400_MAGN_CHAN(Z, ADIS16400_ZMAGN_OUT, 16),
647 648 {
648 649 .type = IIO_PRESSURE,
649   - .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |
650   - IIO_CHAN_INFO_SCALE_SHARED_BIT,
  650 + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
  651 + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),
651 652 .address = ADIS16448_BARO_OUT,
652 653 .scan_index = ADIS16400_SCAN_BARO,
653 654 .scan_type = IIO_ST('s', 16, 16, 0),