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>

diff --git a/drivers/hwmon/asus-ec-sensors.c b/drivers/hwmon/asus-ec-sensors.c
index 728e21fddae891dfca05b8eaab8e1b85feee15ac..ecb058e8755bd927c81ef12221919a73f2dddf68 100644 (file)
--- a/drivers/hwmon/asus-ec-sensors.c
+++ b/drivers/hwmon/asus-ec-sensors.c
@@ -384,6 +384,52 @@ struct ec_board_info {
        enum board_family family;
 };
 
+static const struct ec_board_info board_info_crosshair_viii_dark_hero = {
+       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
+               SENSOR_TEMP_T_SENSOR |
+               SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
+               SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW |
+               SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE,
+       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
+       .family = family_amd_500_series,
+};
+
+static const struct ec_board_info board_info_crosshair_viii_hero = {
+       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
+               SENSOR_TEMP_T_SENSOR |
+               SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
+               SENSOR_FAN_CPU_OPT | SENSOR_FAN_CHIPSET |
+               SENSOR_FAN_WATER_FLOW | SENSOR_CURR_CPU |
+               SENSOR_IN_CPU_CORE,
+       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
+       .family = family_amd_500_series,
+};
+
+static const struct ec_board_info board_info_crosshair_viii_impact = {
+       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
+               SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
+               SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU |
+               SENSOR_IN_CPU_CORE,
+       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
+       .family = family_amd_500_series,
+};
+
+static const struct ec_board_info board_info_crosshair_x670e_gene = {
+       .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE |
+               SENSOR_TEMP_T_SENSOR |
+               SENSOR_TEMP_MB | SENSOR_TEMP_VRM,
+       .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH,
+       .family = family_amd_600_series,
+};
+
+static const struct ec_board_info board_info_crosshair_x670e_hero = {
+       .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE |
+               SENSOR_TEMP_MB | SENSOR_TEMP_VRM |
+               SENSOR_SET_TEMP_WATER,
+       .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH,
+       .family = family_amd_600_series,
+};
+
 static const struct ec_board_info board_info_maximus_vi_hero = {
        .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
                SENSOR_TEMP_T_SENSOR |
@@ -393,6 +439,22 @@ static const struct ec_board_info board_info_maximus_vi_hero = {
        .family = family_intel_300_series,
 };
 
+static const struct ec_board_info board_info_maximus_xi_hero = {
+       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
+               SENSOR_TEMP_T_SENSOR |
+               SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
+               SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW,
+       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
+       .family = family_intel_300_series,
+};
+
+static const struct ec_board_info board_info_maximus_z690_formula = {
+       .sensors = SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
+               SENSOR_SET_TEMP_WATER | SENSOR_FAN_WATER_FLOW,
+       .mutex_path = ASUS_HW_ACCESS_MUTEX_RMTW_ASMX,
+       .family = family_intel_600_series,
+};
+
 static const struct ec_board_info board_info_prime_x470_pro = {
        .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
                SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
@@ -417,6 +479,14 @@ static const struct ec_board_info board_info_prime_x670e_pro_wifi = {
        .family = family_amd_600_series,
 };
 
+static const struct ec_board_info board_info_pro_art_b550_creator = {
+       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
+               SENSOR_TEMP_T_SENSOR |
+               SENSOR_FAN_CPU_OPT,
+       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
+       .family = family_amd_500_series,
+};
+
 static const struct ec_board_info board_info_pro_art_x570_creator_wifi = {
        .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | SENSOR_TEMP_VRM |
                SENSOR_TEMP_T_SENSOR | SENSOR_FAN_CPU_OPT |
@@ -441,14 +511,6 @@ static const struct ec_board_info board_info_pro_art_x870E_creator_wifi = {
        .family = family_amd_800_series,
 };
 
-static const struct ec_board_info board_info_pro_art_b550_creator = {
-       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
-               SENSOR_TEMP_T_SENSOR |
-               SENSOR_FAN_CPU_OPT,
-       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
-       .family = family_amd_500_series,
-};
-
 static const struct ec_board_info board_info_pro_ws_wrx90e_sage_se = {
        /* Board also has a nct6798 with 7 more fans and temperatures */
        .sensors = SENSOR_TEMP_CPU_PACKAGE | SENSOR_TEMP_T_SENSOR |
@@ -466,68 +528,6 @@ static const struct ec_board_info board_info_pro_ws_x570_ace = {
        .family = family_amd_500_series,
 };
 
-static const struct ec_board_info board_info_crosshair_x670e_hero = {
-       .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE |
-               SENSOR_TEMP_MB | SENSOR_TEMP_VRM |
-               SENSOR_SET_TEMP_WATER,
-       .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH,
-       .family = family_amd_600_series,
-};
-
-static const struct ec_board_info board_info_crosshair_x670e_gene = {
-       .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE |
-               SENSOR_TEMP_T_SENSOR |
-               SENSOR_TEMP_MB | SENSOR_TEMP_VRM,
-       .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH,
-       .family = family_amd_600_series,
-};
-
-static const struct ec_board_info board_info_crosshair_viii_dark_hero = {
-       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
-               SENSOR_TEMP_T_SENSOR |
-               SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
-               SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW |
-               SENSOR_CURR_CPU | SENSOR_IN_CPU_CORE,
-       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
-       .family = family_amd_500_series,
-};
-
-static const struct ec_board_info board_info_crosshair_viii_hero = {
-       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
-               SENSOR_TEMP_T_SENSOR |
-               SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
-               SENSOR_FAN_CPU_OPT | SENSOR_FAN_CHIPSET |
-               SENSOR_FAN_WATER_FLOW | SENSOR_CURR_CPU |
-               SENSOR_IN_CPU_CORE,
-       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
-       .family = family_amd_500_series,
-};
-
-static const struct ec_board_info board_info_maximus_xi_hero = {
-       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
-               SENSOR_TEMP_T_SENSOR |
-               SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
-               SENSOR_FAN_CPU_OPT | SENSOR_FAN_WATER_FLOW,
-       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
-       .family = family_intel_300_series,
-};
-
-static const struct ec_board_info board_info_maximus_z690_formula = {
-       .sensors = SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
-               SENSOR_SET_TEMP_WATER | SENSOR_FAN_WATER_FLOW,
-       .mutex_path = ASUS_HW_ACCESS_MUTEX_RMTW_ASMX,
-       .family = family_intel_600_series,
-};
-
-static const struct ec_board_info board_info_crosshair_viii_impact = {
-       .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
-               SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
-               SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU |
-               SENSOR_IN_CPU_CORE,
-       .mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,
-       .family = family_amd_500_series,
-};
-
 static const struct ec_board_info board_info_strix_b550_e_gaming = {
        .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
                SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
@@ -645,6 +645,15 @@ static const struct ec_board_info board_info_strix_z790_i_gaming_wifi = {
        .family = family_intel_700_series,
 };
 
+static const struct ec_board_info board_info_tuf_gaming_x670e_plus = {
+       .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE |
+               SENSOR_TEMP_MB | SENSOR_TEMP_VRM |
+               SENSOR_TEMP_WATER_IN | SENSOR_TEMP_WATER_OUT |
+               SENSOR_FAN_CPU_OPT,
+       .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH,
+       .family = family_amd_600_series,
+};
+
 static const struct ec_board_info board_info_zenith_ii_extreme = {
        .sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB | SENSOR_TEMP_T_SENSOR |
                SENSOR_TEMP_VRM | SENSOR_SET_TEMP_WATER |
@@ -657,15 +666,6 @@ static const struct ec_board_info board_info_zenith_ii_extreme = {
        .family = family_amd_500_series,
 };
 
-static const struct ec_board_info board_info_tuf_gaming_x670e_plus = {
-       .sensors = SENSOR_TEMP_CPU | SENSOR_TEMP_CPU_PACKAGE |
-               SENSOR_TEMP_MB | SENSOR_TEMP_VRM |
-               SENSOR_TEMP_WATER_IN | SENSOR_TEMP_WATER_OUT |
-               SENSOR_FAN_CPU_OPT,
-       .mutex_path = ACPI_GLOBAL_LOCK_PSEUDO_PATH,
-       .family = family_amd_600_series,
-};
-
 #define DMI_EXACT_MATCH_ASUS_BOARD_NAME(name, board_info)                      \
        {                                                                      \
                .matches = {                                                   \
@@ -685,14 +685,14 @@ static const struct dmi_system_id dmi_table[] = {
                                        &board_info_prime_x570_pro),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("PRIME X670E-PRO WIFI",
                                        &board_info_prime_x670e_pro_wifi),
+       DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt B550-CREATOR",
+                                       &board_info_pro_art_b550_creator),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt X570-CREATOR WIFI",
                                        &board_info_pro_art_x570_creator_wifi),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt X670E-CREATOR WIFI",
                                        &board_info_pro_art_x670E_creator_wifi),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt X870E-CREATOR WIFI",
                                        &board_info_pro_art_x870E_creator_wifi),
-       DMI_EXACT_MATCH_ASUS_BOARD_NAME("ProArt B550-CREATOR",
-                                       &board_info_pro_art_b550_creator),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("Pro WS WRX90E-SAGE SE",
                                        &board_info_pro_ws_wrx90e_sage_se),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("Pro WS X570-ACE",
@@ -705,18 +705,18 @@ static const struct dmi_system_id dmi_table[] = {
                                        &board_info_crosshair_viii_hero),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR VIII HERO (WI-FI)",
                                        &board_info_crosshair_viii_hero),
-       DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR X670E HERO",
-                                       &board_info_crosshair_x670e_hero),
+       DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR VIII IMPACT",
+                                       &board_info_crosshair_viii_impact),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR X670E GENE",
                                        &board_info_crosshair_x670e_gene),
+       DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR X670E HERO",
+                                       &board_info_crosshair_x670e_hero),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS XI HERO",
                                        &board_info_maximus_xi_hero),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS XI HERO (WI-FI)",
                                        &board_info_maximus_xi_hero),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG MAXIMUS Z690 FORMULA",
                                        &board_info_maximus_z690_formula),
-       DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG CROSSHAIR VIII IMPACT",
-                                       &board_info_crosshair_viii_impact),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX B550-E GAMING",
                                        &board_info_strix_b550_e_gaming),
        DMI_EXACT_MATCH_ASUS_BOARD_NAME("ROG STRIX B550-I GAMING",