Commit ae98e57a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarZhang Rui <rui.zhang@intel.com>
parent c5f43242
...@@ -135,38 +135,38 @@ static struct thermal_zone_device_ops tzd_ops = { ...@@ -135,38 +135,38 @@ static struct thermal_zone_device_ops tzd_ops = {
.critical = pch_critical, .critical = pch_critical,
}; };
enum board_ids { enum pch_board_ids {
board_hsw, PCH_BOARD_HSW = 0,
board_wpt, PCH_BOARD_WPT,
board_skl, PCH_BOARD_SKL,
board_cnl, PCH_BOARD_CNL,
board_cml, PCH_BOARD_CML,
board_lwb, PCH_BOARD_LWB,
board_wbg, PCH_BOARD_WBG,
}; };
static const struct board_info { static const struct board_info {
const char *name; const char *name;
} board_info[] = { } board_info[] = {
[board_hsw] = { [PCH_BOARD_HSW] = {
.name = "pch_haswell", .name = "pch_haswell",
}, },
[board_wpt] = { [PCH_BOARD_WPT] = {
.name = "pch_wildcat_point", .name = "pch_wildcat_point",
}, },
[board_skl] = { [PCH_BOARD_SKL] = {
.name = "pch_skylake", .name = "pch_skylake",
}, },
[board_cnl] = { [PCH_BOARD_CNL] = {
.name = "pch_cannonlake", .name = "pch_cannonlake",
}, },
[board_cml] = { [PCH_BOARD_CML] = {
.name = "pch_cometlake", .name = "pch_cometlake",
}, },
[board_lwb] = { [PCH_BOARD_LWB] = {
.name = "pch_lewisburg", .name = "pch_lewisburg",
}, },
[board_wbg] = { [PCH_BOARD_WBG] = {
.name = "pch_wellsburg", .name = "pch_wellsburg",
}, },
}; };
...@@ -174,7 +174,7 @@ static const struct board_info { ...@@ -174,7 +174,7 @@ static const struct board_info {
static int intel_pch_thermal_probe(struct pci_dev *pdev, static int intel_pch_thermal_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
enum board_ids board_id = id->driver_data; enum pch_board_ids board_id = id->driver_data;
const struct board_info *bi = &board_info[board_id]; const struct board_info *bi = &board_info[board_id];
struct pch_thermal_device *ptd; struct pch_thermal_device *ptd;
int nr_trips = 0; int nr_trips = 0;
...@@ -372,27 +372,27 @@ static int intel_pch_thermal_resume(struct device *device) ...@@ -372,27 +372,27 @@ static int intel_pch_thermal_resume(struct device *device)
static const struct pci_device_id intel_pch_thermal_id[] = { static const struct pci_device_id intel_pch_thermal_id[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_HSW_1), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_HSW_1),
.driver_data = board_hsw, }, .driver_data = PCH_BOARD_HSW, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_HSW_2), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_HSW_2),
.driver_data = board_hsw, }, .driver_data = PCH_BOARD_HSW, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WPT), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WPT),
.driver_data = board_wpt, }, .driver_data = PCH_BOARD_WPT, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_SKL), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_SKL),
.driver_data = board_skl, }, .driver_data = PCH_BOARD_SKL, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_SKL_H), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_SKL_H),
.driver_data = board_skl, }, .driver_data = PCH_BOARD_SKL, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL),
.driver_data = board_cnl, }, .driver_data = PCH_BOARD_CNL, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL_H), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL_H),
.driver_data = board_cnl, }, .driver_data = PCH_BOARD_CNL, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL_LP), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CNL_LP),
.driver_data = board_cnl, }, .driver_data = PCH_BOARD_CNL, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CML_H), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_CML_H),
.driver_data = board_cml, }, .driver_data = PCH_BOARD_CML, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_LWB), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_LWB),
.driver_data = board_lwb, }, .driver_data = PCH_BOARD_LWB, },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WBG), { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCH_THERMAL_DID_WBG),
.driver_data = board_wbg, }, .driver_data = PCH_BOARD_WBG, },
{ 0, }, { 0, },
}; };
MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id); MODULE_DEVICE_TABLE(pci, intel_pch_thermal_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment