Skip to content

Commit ae98e57

Browse files
committed
thermal: intel: intel_pch: Rename board ID symbols
Use capitals in the names of the board ID symbols and add the PCH_ prefix to each of them for consistency. Also rename the board_ids enum accordingly. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <[email protected]> Acked-by: Daniel Lezcano <[email protected]> Tested-by: Zhang Rui <[email protected]> Reviewed-by: Zhang Rui <[email protected]>
1 parent c5f4324 commit ae98e57

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

drivers/thermal/intel/intel_pch_thermal.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -135,46 +135,46 @@ static struct thermal_zone_device_ops tzd_ops = {
135135
.critical = pch_critical,
136136
};
137137

138-
enum board_ids {
139-
board_hsw,
140-
board_wpt,
141-
board_skl,
142-
board_cnl,
143-
board_cml,
144-
board_lwb,
145-
board_wbg,
138+
enum pch_board_ids {
139+
PCH_BOARD_HSW = 0,
140+
PCH_BOARD_WPT,
141+
PCH_BOARD_SKL,
142+
PCH_BOARD_CNL,
143+
PCH_BOARD_CML,
144+
PCH_BOARD_LWB,
145+
PCH_BOARD_WBG,
146146
};
147147

148148
static const struct board_info {
149149
const char *name;
150150
} board_info[] = {
151-
[board_hsw] = {
151+
[PCH_BOARD_HSW] = {
152152
.name = "pch_haswell",
153153
},
154-
[board_wpt] = {
154+
[PCH_BOARD_WPT] = {
155155
.name = "pch_wildcat_point",
156156
},
157-
[board_skl] = {
157+
[PCH_BOARD_SKL] = {
158158
.name = "pch_skylake",
159159
},
160-
[board_cnl] = {
160+
[PCH_BOARD_CNL] = {
161161
.name = "pch_cannonlake",
162162
},
163-
[board_cml] = {
163+
[PCH_BOARD_CML] = {
164164
.name = "pch_cometlake",
165165
},
166-
[board_lwb] = {
166+
[PCH_BOARD_LWB] = {
167167
.name = "pch_lewisburg",
168168
},
169-
[board_wbg] = {
169+
[PCH_BOARD_WBG] = {
170170
.name = "pch_wellsburg",
171171
},
172172
};
173173

174174
static int intel_pch_thermal_probe(struct pci_dev *pdev,
175175
const struct pci_device_id *id)
176176
{
177-
enum board_ids board_id = id->driver_data;
177+
enum pch_board_ids board_id = id->driver_data;
178178
const struct board_info *bi = &board_info[board_id];
179179
struct pch_thermal_device *ptd;
180180
int nr_trips = 0;
@@ -372,27 +372,27 @@ static int intel_pch_thermal_resume(struct device *device)
372372

373373
static const struct pci_device_id intel_pch_thermal_id[] = {
374374
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_HSW_1),
375-
.driver_data = board_hsw, },
375+
.driver_data = PCH_BOARD_HSW, },
376376
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_HSW_2),
377-
.driver_data = board_hsw, },
377+
.driver_data = PCH_BOARD_HSW, },
378378
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WPT),
379-
.driver_data = board_wpt, },
379+
.driver_data = PCH_BOARD_WPT, },
380380
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_SKL),
381-
.driver_data = board_skl, },
381+
.driver_data = PCH_BOARD_SKL, },
382382
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_SKL_H),
383-
.driver_data = board_skl, },
383+
.driver_data = PCH_BOARD_SKL, },
384384
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL),
385-
.driver_data = board_cnl, },
385+
.driver_data = PCH_BOARD_CNL, },
386386
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL_H),
387-
.driver_data = board_cnl, },
387+
.driver_data = PCH_BOARD_CNL, },
388388
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL_LP),
389-
.driver_data = board_cnl, },
389+
.driver_data = PCH_BOARD_CNL, },
390390
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CML_H),
391-
.driver_data = board_cml, },
391+
.driver_data = PCH_BOARD_CML, },
392392
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_LWB),
393-
.driver_data = board_lwb, },
393+
.driver_data = PCH_BOARD_LWB, },
394394
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WBG),
395-
.driver_data = board_wbg, },
395+
.driver_data = PCH_BOARD_WBG, },
396396
{ 0, },
397397
};
398398
MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id);

0 commit comments

Comments
 (0)