The ACPI PCH FIVR device IDs are shared between the DPTF core
and PCH FIVR driver, thus they are moved to the common header.
Signed-off-by: Slawomir Rosek <srosek@xxxxxxxxxx>
---
drivers/acpi/dptf/dptf_pch_fivr.c | 8 ++------
drivers/acpi/dptf/int340x_thermal.c | 7 +------
drivers/acpi/int340x_thermal.h | 8 ++++++++
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/acpi/dptf/dptf_pch_fivr.c b/drivers/acpi/dptf/dptf_pch_fivr.c
index 952216c67d58..cb81636a5d63 100644
--- a/drivers/acpi/dptf/dptf_pch_fivr.c
+++ b/drivers/acpi/dptf/dptf_pch_fivr.c
@@ -8,6 +8,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include "../int340x_thermal.h"
struct pch_fivr_resp {
u64 status;
@@ -147,12 +148,7 @@ static void pch_fivr_remove(struct platform_device *pdev)
}
static const struct acpi_device_id pch_fivr_device_ids[] = {
- {"INTC1045", 0},
- {"INTC1049", 0},
- {"INTC1064", 0},
- {"INTC106B", 0},
- {"INTC10A3", 0},
- {"INTC10D7", 0},
+ ACPI_PCH_FIVR_DEVICE_IDS,
{"", 0},
};
MODULE_DEVICE_TABLE(acpi, pch_fivr_device_ids);
diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
index 43afb6141b98..26522ddfcbaa 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -20,16 +20,11 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = {
ACPI_INT3404_DEVICE_IDS,
ACPI_INT3406_DEVICE_IDS,
ACPI_INT3407_DEVICE_IDS,
+ ACPI_PCH_FIVR_DEVICE_IDS,
{"INT3408"},
{"INT3409"},
{"INT340A"},
{"INT340B"},
- {"INTC1045"},
- {"INTC1049"},
- {"INTC1064"},
- {"INTC106B"},
- {"INTC10A3"},
- {"INTC10D7"},
{"INTC10FF"},
{"INTC1102"},
{""},
diff --git a/drivers/acpi/int340x_thermal.h b/drivers/acpi/int340x_thermal.h
index 8a3d2a9b218a..41e4ca2bc6e2 100644
--- a/drivers/acpi/int340x_thermal.h
+++ b/drivers/acpi/int340x_thermal.h
@@ -65,4 +65,12 @@
{"INTC1100"}, \
{"INTC1101"}
+#define ACPI_PCH_FIVR_DEVICE_IDS \
+ {"INTC1045"}, \
+ {"INTC1049"}, \
+ {"INTC1064"}, \
+ {"INTC106B"}, \
+ {"INTC10A3"}, \
+ {"INTC10D7"}
+
#endif
--
2.51.0.318.gd7df087d1a-goog
