Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (asus-ec-sensors) sort declarations

Sort all the declarations in the source file. Contributors are asked
to insert new entries keeping alphabetical order, but the existing
ones were not completely sorted.

Signed-off-by: Michael Tandy <git@mjt.me.uk>
Signed-off-by: Eugene Shalygin <eugene.shalygin@gmail.com>
Link: https://lore.kernel.org/r/20250903184753.5876-1-eugene.shalygin@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

authored by

Michael Tandy and committed by
Guenter Roeck
5529bc1a 34c61c19

+85 -85
+85 -85
drivers/hwmon/asus-ec-sensors.c
··· 384 384 enum board_family family; 385 385 }; 386 386 387 + static const struct ec_board_info board_info_crosshair_viii_dark_hero = { 388 + .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 389 + SENSOR_TEMP_T_SENSOR | 390 + SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER | 391 + SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW | 392 + SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE, 393 + .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 394 + .family = family_amd_500_series, 395 + }; 396 + 397 + static const struct ec_board_info board_info_crosshair_viii_hero = { 398 + .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 399 + SENSOR_TEMP_T_SENSOR | 400 + SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER | 401 + SENSOR_FAN_CPU_OPT | SENSOR_FAN_CHIPSET | 402 + SENSOR_FAN_WATER_FLOW | SENSOR_CURR_CPU | 403 + SENSOR_IN_CPU_CORE, 404 + .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 405 + .family = family_amd_500_series, 406 + }; 407 + 408 + static const struct ec_board_info board_info_crosshair_viii_impact = { 409 + .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 410 + SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM | 411 + SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU | 412 + SENSOR_IN_CPU_CORE, 413 + .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 414 + .family = family_amd_500_series, 415 + }; 416 + 417 + static const struct ec_board_info board_info_crosshair_x670e_gene = { 418 + .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | 419 + SENSOR_TEMP_T_SENSOR | 420 + SENSOR_TEMP_MB | SENSOR_TEMP_VRM, 421 + .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, 422 + .family = family_amd_600_series, 423 + }; 424 + 425 + static const struct ec_board_info board_info_crosshair_x670e_hero = { 426 + .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | 427 + SENSOR_TEMP_MB | SENSOR_TEMP_VRM | 428 + SENSOR_SET_TEMP_WATER, 429 + .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, 430 + .family = family_amd_600_series, 431 + }; 432 + 387 433 static const struct ec_board_info board_info_maximus_vi_hero = { 388 434 .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 389 435 SENSOR_TEMP_T_SENSOR | ··· 437 391 SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW, 438 392 .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, 439 393 .family = family_intel_300_series, 394 + }; 395 + 396 + static const struct ec_board_info board_info_maximus_xi_hero = { 397 + .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 398 + SENSOR_TEMP_T_SENSOR | 399 + SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER | 400 + SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW, 401 + .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 402 + .family = family_intel_300_series, 403 + }; 404 + 405 + static const struct ec_board_info board_info_maximus_z690_formula = { 406 + .sensors = SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM | 407 + SENSOR_SET_TEMP_WATER | SENSOR_FAN_WATER_FLOW, 408 + .mutex_path = ASUS_HW_ACCESS_MUTEX_RMTW_ASMX, 409 + .family = family_intel_600_series, 440 410 }; 441 411 442 412 static const struct ec_board_info board_info_prime_x470_pro = { ··· 479 417 .family = family_amd_600_series, 480 418 }; 481 419 420 + static const struct ec_board_info board_info_pro_art_b550_creator = { 421 + .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 422 + SENSOR_TEMP_T_SENSOR | 423 + SENSOR_FAN_CPU_OPT, 424 + .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 425 + .family = family_amd_500_series, 426 + }; 427 + 482 428 static const struct ec_board_info board_info_pro_art_x570_creator_wifi = { 483 429 .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | SENSOR_TEMP_VRM | 484 430 SENSOR_TEMP_T_SENSOR | SENSOR_FAN_CPU_OPT | ··· 511 441 .family = family_amd_800_series, 512 442 }; 513 443 514 - static const struct ec_board_info board_info_pro_art_b550_creator = { 515 - .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 516 - SENSOR_TEMP_T_SENSOR | 517 - SENSOR_FAN_CPU_OPT, 518 - .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 519 - .family = family_amd_500_series, 520 - }; 521 - 522 444 static const struct ec_board_info board_info_pro_ws_wrx90e_sage_se = { 523 445 /* Board also has a nct6798 with 7 more fans and temperatures */ 524 446 .sensors = SENSOR_TEMP_CPU_PACKAGE | SENSOR_TEMP_T_SENSOR | ··· 524 462 .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | SENSOR_TEMP_VRM | 525 463 SENSOR_TEMP_T_SENSOR | SENSOR_FAN_CHIPSET | 526 464 SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE, 527 - .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 528 - .family = family_amd_500_series, 529 - }; 530 - 531 - static const struct ec_board_info board_info_crosshair_x670e_hero = { 532 - .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | 533 - SENSOR_TEMP_MB | SENSOR_TEMP_VRM | 534 - SENSOR_SET_TEMP_WATER, 535 - .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, 536 - .family = family_amd_600_series, 537 - }; 538 - 539 - static const struct ec_board_info board_info_crosshair_x670e_gene = { 540 - .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | 541 - SENSOR_TEMP_T_SENSOR | 542 - SENSOR_TEMP_MB | SENSOR_TEMP_VRM, 543 - .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, 544 - .family = family_amd_600_series, 545 - }; 546 - 547 - static const struct ec_board_info board_info_crosshair_viii_dark_hero = { 548 - .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 549 - SENSOR_TEMP_T_SENSOR | 550 - SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER | 551 - SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW | 552 - SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE, 553 - .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 554 - .family = family_amd_500_series, 555 - }; 556 - 557 - static const struct ec_board_info board_info_crosshair_viii_hero = { 558 - .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 559 - SENSOR_TEMP_T_SENSOR | 560 - SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER | 561 - SENSOR_FAN_CPU_OPT | SENSOR_FAN_CHIPSET | 562 - SENSOR_FAN_WATER_FLOW | SENSOR_CURR_CPU | 563 - SENSOR_IN_CPU_CORE, 564 - .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 565 - .family = family_amd_500_series, 566 - }; 567 - 568 - static const struct ec_board_info board_info_maximus_xi_hero = { 569 - .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 570 - SENSOR_TEMP_T_SENSOR | 571 - SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER | 572 - SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW, 573 - .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 574 - .family = family_intel_300_series, 575 - }; 576 - 577 - static const struct ec_board_info board_info_maximus_z690_formula = { 578 - .sensors = SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM | 579 - SENSOR_SET_TEMP_WATER | SENSOR_FAN_WATER_FLOW, 580 - .mutex_path = ASUS_HW_ACCESS_MUTEX_RMTW_ASMX, 581 - .family = family_intel_600_series, 582 - }; 583 - 584 - static const struct ec_board_info board_info_crosshair_viii_impact = { 585 - .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | 586 - SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM | 587 - SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU | 588 - SENSOR_IN_CPU_CORE, 589 465 .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX, 590 466 .family = family_amd_500_series, 591 467 }; ··· 645 645 .family = family_intel_700_series, 646 646 }; 647 647 648 + static const struct ec_board_info board_info_tuf_gaming_x670e_plus = { 649 + .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | 650 + SENSOR_TEMP_MB | SENSOR_TEMP_VRM | 651 + SENSOR_TEMP_WATER_IN | SENSOR_TEMP_WATER_OUT | 652 + SENSOR_FAN_CPU_OPT, 653 + .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, 654 + .family = family_amd_600_series, 655 + }; 656 + 648 657 static const struct ec_board_info board_info_zenith_ii_extreme = { 649 658 .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | SENSOR_TEMP_T_SENSOR | 650 659 SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER | ··· 664 655 SENSOR_TEMP_SENSOR_EXTRA_2 | SENSOR_TEMP_SENSOR_EXTRA_3, 665 656 .mutex_path = ASUS_HW_ACCESS_MUTEX_SB_PCI0_SBRG_SIO1_MUT0, 666 657 .family = family_amd_500_series, 667 - }; 668 - 669 - static const struct ec_board_info board_info_tuf_gaming_x670e_plus = { 670 - .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE | 671 - SENSOR_TEMP_MB | SENSOR_TEMP_VRM | 672 - SENSOR_TEMP_WATER_IN | SENSOR_TEMP_WATER_OUT | 673 - SENSOR_FAN_CPU_OPT, 674 - .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH, 675 - .family = family_amd_600_series, 676 658 }; 677 659 678 660 #define DMI_EXACT_MATCH_ASUS_BOARD_NAME(name, board_info) \ ··· 685 685 &board_info_prime_x570_pro), 686 686 DMI_EXACT_MATCH_ASUS_BOARD_NAME("PRIME X670E-PRO WIFI", 687 687 &board_info_prime_x670e_pro_wifi), 688 + DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt B550-CREATOR", 689 + &board_info_pro_art_b550_creator), 688 690 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt X570-CREATOR WIFI", 689 691 &board_info_pro_art_x570_creator_wifi), 690 692 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt X670E-CREATOR WIFI", 691 693 &board_info_pro_art_x670E_creator_wifi), 692 694 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt X870E-CREATOR WIFI", 693 695 &board_info_pro_art_x870E_creator_wifi), 694 - DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt B550-CREATOR", 695 - &board_info_pro_art_b550_creator), 696 696 DMI_EXACT_MATCH_ASUS_BOARD_NAME("Pro WS WRX90E-SAGE SE", 697 697 &board_info_pro_ws_wrx90e_sage_se), 698 698 DMI_EXACT_MATCH_ASUS_BOARD_NAME("Pro WS X570-ACE", ··· 705 705 &board_info_crosshair_viii_hero), 706 706 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR VIII HERO (WI-FI)", 707 707 &board_info_crosshair_viii_hero), 708 - DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR X670E HERO", 709 - &board_info_crosshair_x670e_hero), 708 + DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR VIII IMPACT", 709 + &board_info_crosshair_viii_impact), 710 710 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR X670E GENE", 711 711 &board_info_crosshair_x670e_gene), 712 + DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR X670E HERO", 713 + &board_info_crosshair_x670e_hero), 712 714 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS XI HERO", 713 715 &board_info_maximus_xi_hero), 714 716 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS XI HERO (WI-FI)", 715 717 &board_info_maximus_xi_hero), 716 718 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS Z690 FORMULA", 717 719 &board_info_maximus_z690_formula), 718 - DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR VIII IMPACT", 719 - &board_info_crosshair_viii_impact), 720 720 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX B550-E GAMING", 721 721 &board_info_strix_b550_e_gaming), 722 722 DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX B550-I GAMING",