The ACPI INT3402 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/int3402_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 8fa85c866675..cf2e95a4f65a 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -15,7 +15,7 @@
static const struct acpi_device_id int340x_thermal_device_ids[] = {
ACPI_INT3400_DEVICE_IDS,
ACPI_INT3401_DEVICE_IDS,
- {"INT3402"},
+ ACPI_INT3402_DEVICE_IDS,
{"INT3403"},
{"INT3404"},
{"INT3406"},
diff --git a/drivers/acpi/int340x_thermal.h b/drivers/acpi/int340x_thermal.h
index 3ecd6c4bf2ca..cc1dfa56fc09 100644
--- a/drivers/acpi/int340x_thermal.h
+++ b/drivers/acpi/int340x_thermal.h
@@ -21,4 +21,7 @@
#define ACPI_INT3401_DEVICE_IDS \
{"INT3401"}
+#define ACPI_INT3402_DEVICE_IDS \
+ {"INT3402"}
+
#endif
diff --git a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c
index 57b90005888a..213d4535f2c1 100644
--- a/drivers/thermal/intel/int340x_thermal/int3402_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3402_thermal.c
@@ -11,6 +11,7 @@
#include <linux/acpi.h>
#include <linux/thermal.h>
#include "int340x_thermal_zone.h"
+#include "../../../../drivers/acpi/int340x_thermal.h"
#define INT3402_PERF_CHANGED_EVENT 0x80
#define INT3402_THERMAL_EVENT 0x90
@@ -84,7 +85,7 @@ static void int3402_thermal_remove(struct platform_device *pdev)
}
static const struct acpi_device_id int3402_thermal_match[] = {
- {"INT3402", 0},
+ ACPI_INT3402_DEVICE_IDS,
{}
};
--
2.51.0.318.gd7df087d1a-goog
