@@ -135,46 +135,46 @@ static struct thermal_zone_device_ops tzd_ops = {
135
135
.critical = pch_critical ,
136
136
};
137
137
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 ,
146
146
};
147
147
148
148
static const struct board_info {
149
149
const char * name ;
150
150
} board_info [] = {
151
- [board_hsw ] = {
151
+ [PCH_BOARD_HSW ] = {
152
152
.name = "pch_haswell" ,
153
153
},
154
- [board_wpt ] = {
154
+ [PCH_BOARD_WPT ] = {
155
155
.name = "pch_wildcat_point" ,
156
156
},
157
- [board_skl ] = {
157
+ [PCH_BOARD_SKL ] = {
158
158
.name = "pch_skylake" ,
159
159
},
160
- [board_cnl ] = {
160
+ [PCH_BOARD_CNL ] = {
161
161
.name = "pch_cannonlake" ,
162
162
},
163
- [board_cml ] = {
163
+ [PCH_BOARD_CML ] = {
164
164
.name = "pch_cometlake" ,
165
165
},
166
- [board_lwb ] = {
166
+ [PCH_BOARD_LWB ] = {
167
167
.name = "pch_lewisburg" ,
168
168
},
169
- [board_wbg ] = {
169
+ [PCH_BOARD_WBG ] = {
170
170
.name = "pch_wellsburg" ,
171
171
},
172
172
};
173
173
174
174
static int intel_pch_thermal_probe (struct pci_dev * pdev ,
175
175
const struct pci_device_id * id )
176
176
{
177
- enum board_ids board_id = id -> driver_data ;
177
+ enum pch_board_ids board_id = id -> driver_data ;
178
178
const struct board_info * bi = & board_info [board_id ];
179
179
struct pch_thermal_device * ptd ;
180
180
int nr_trips = 0 ;
@@ -372,27 +372,27 @@ static int intel_pch_thermal_resume(struct device *device)
372
372
373
373
static const struct pci_device_id intel_pch_thermal_id [] = {
374
374
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_HSW_1 ),
375
- .driver_data = board_hsw , },
375
+ .driver_data = PCH_BOARD_HSW , },
376
376
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_HSW_2 ),
377
- .driver_data = board_hsw , },
377
+ .driver_data = PCH_BOARD_HSW , },
378
378
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_WPT ),
379
- .driver_data = board_wpt , },
379
+ .driver_data = PCH_BOARD_WPT , },
380
380
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_SKL ),
381
- .driver_data = board_skl , },
381
+ .driver_data = PCH_BOARD_SKL , },
382
382
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_SKL_H ),
383
- .driver_data = board_skl , },
383
+ .driver_data = PCH_BOARD_SKL , },
384
384
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_CNL ),
385
- .driver_data = board_cnl , },
385
+ .driver_data = PCH_BOARD_CNL , },
386
386
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_CNL_H ),
387
- .driver_data = board_cnl , },
387
+ .driver_data = PCH_BOARD_CNL , },
388
388
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_CNL_LP ),
389
- .driver_data = board_cnl , },
389
+ .driver_data = PCH_BOARD_CNL , },
390
390
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_CML_H ),
391
- .driver_data = board_cml , },
391
+ .driver_data = PCH_BOARD_CML , },
392
392
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_LWB ),
393
- .driver_data = board_lwb , },
393
+ .driver_data = PCH_BOARD_LWB , },
394
394
{ PCI_DEVICE (PCI_VENDOR_ID_INTEL , PCH_THERMAL_DID_WBG ),
395
- .driver_data = board_wbg , },
395
+ .driver_data = PCH_BOARD_WBG , },
396
396
{ 0 , },
397
397
};
398
398
MODULE_DEVICE_TABLE (pci , intel_pch_thermal_id );
0 commit comments