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

thermal: intel: intel_pch: Drop struct board_info

Because the only member of struct board_info is the name, the
board_info[] array of struct board_info elements can be replaced with
an array of strings.

Modify the code accordingly and drop struct board_info.

No intentional functional impact.

Suggested-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>

+13 -29
+13 -29
drivers/thermal/intel/intel_pch_thermal.c
··· 145 145 PCH_BOARD_WBG, 146 146 }; 147 147 148 - static const struct board_info { 149 - const char *name; 150 - } board_info[] = { 151 - [PCH_BOARD_HSW] = { 152 - .name = "pch_haswell", 153 - }, 154 - [PCH_BOARD_WPT] = { 155 - .name = "pch_wildcat_point", 156 - }, 157 - [PCH_BOARD_SKL] = { 158 - .name = "pch_skylake", 159 - }, 160 - [PCH_BOARD_CNL] = { 161 - .name = "pch_cannonlake", 162 - }, 163 - [PCH_BOARD_CML] = { 164 - .name = "pch_cometlake", 165 - }, 166 - [PCH_BOARD_LWB] = { 167 - .name = "pch_lewisburg", 168 - }, 169 - [PCH_BOARD_WBG] = { 170 - .name = "pch_wellsburg", 171 - }, 148 + static const char *board_names[] = { 149 + [PCH_BOARD_HSW] = "pch_haswell", 150 + [PCH_BOARD_WPT] = "pch_wildcat_point", 151 + [PCH_BOARD_SKL] = "pch_skylake", 152 + [PCH_BOARD_CNL] = "pch_cannonlake", 153 + [PCH_BOARD_CML] = "pch_cometlake", 154 + [PCH_BOARD_LWB] = "pch_lewisburg", 155 + [PCH_BOARD_WBG] = "pch_wellsburg", 172 156 }; 173 157 174 158 static int intel_pch_thermal_probe(struct pci_dev *pdev, 175 159 const struct pci_device_id *id) 176 160 { 177 161 enum pch_board_ids board_id = id->driver_data; 178 - const struct board_info *bi = &board_info[board_id]; 179 162 struct pch_thermal_device *ptd; 180 163 int nr_trips = 0; 181 164 u16 trip_temp; ··· 232 249 233 250 nr_trips += pch_wpt_add_acpi_psv_trip(ptd, nr_trips); 234 251 235 - ptd->tzd = thermal_zone_device_register_with_trips(bi->name, ptd->trips, 236 - nr_trips, 0, ptd, 237 - &tzd_ops, NULL, 0, 0); 252 + ptd->tzd = thermal_zone_device_register_with_trips(board_names[board_id], 253 + ptd->trips, nr_trips, 254 + 0, ptd, &tzd_ops, 255 + NULL, 0, 0); 238 256 if (IS_ERR(ptd->tzd)) { 239 257 dev_err(&pdev->dev, "Failed to register thermal zone %s\n", 240 - bi->name); 258 + board_names[board_id]); 241 259 err = PTR_ERR(ptd->tzd); 242 260 goto error_cleanup; 243 261 }