The ACPI INT3401 device IDs are shared between the DPTF core
and thermal drivers, thus they are moved to the common header.
Signed-off-by: Slawomir Rosek <srosek@xxxxxxxxxx>
---
drivers/acpi/dptf/int340x_thermal.c | 2 +-
drivers/acpi/int340x_thermal.h | 3 +++
drivers/thermal/intel/int340x_thermal/int3401_thermal.c | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
index 04df20ef1a2e..8fa85c866675 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -14,7 +14,7 @@
static const struct acpi_device_id int340x_thermal_device_ids[] = {
ACPI_INT3400_DEVICE_IDS,
- {"INT3401"},
+ ACPI_INT3401_DEVICE_IDS,
{"INT3402"},
{"INT3403"},
{"INT3404"},
diff --git a/drivers/acpi/int340x_thermal.h b/drivers/acpi/int340x_thermal.h
index a0d379492a79..3ecd6c4bf2ca 100644
--- a/drivers/acpi/int340x_thermal.h
+++ b/drivers/acpi/int340x_thermal.h
@@ -18,4 +18,7 @@
{"INTC10D4"}, \
{"INTC10FC"}
+#define ACPI_INT3401_DEVICE_IDS \
+ {"INT3401"}
+
#endif
diff --git a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c b/drivers/thermal/intel/int340x_thermal/int3401_thermal.c
index 96d6277a5a8c..e0603f218d2e 100644
--- a/drivers/thermal/intel/int340x_thermal/int3401_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3401_thermal.c
@@ -11,9 +11,10 @@
#include "int340x_thermal_zone.h"
#include "processor_thermal_device.h"
+#include "../../../../drivers/acpi/int340x_thermal.h"
static const struct acpi_device_id int3401_device_ids[] = {
- {"INT3401", 0},
+ ACPI_INT3401_DEVICE_IDS,
{"", 0},
};
MODULE_DEVICE_TABLE(acpi, int3401_device_ids);
--
2.51.0.318.gd7df087d1a-goog
