The ACPI INT3406 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/int3406_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 be2299aadcff..131648ddec87 100644
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -18,7 +18,7 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = {
ACPI_INT3402_DEVICE_IDS,
ACPI_INT3403_DEVICE_IDS,
ACPI_INT3404_DEVICE_IDS,
- {"INT3406"},
+ ACPI_INT3406_DEVICE_IDS,
{"INT3407"},
{"INT3408"},
{"INT3409"},
diff --git a/drivers/acpi/int340x_thermal.h b/drivers/acpi/int340x_thermal.h
index d1ffa9c3cfb7..946f5bb23b44 100644
--- a/drivers/acpi/int340x_thermal.h
+++ b/drivers/acpi/int340x_thermal.h
@@ -44,4 +44,7 @@
{"INTC10D6", }, /* Fan for Panther Lake generation */ \
{"INTC10FE", } /* Fan for Wildcat Lake generation */
+#define ACPI_INT3406_DEVICE_IDS \
+ {"INT3406"}
+
#endif
diff --git a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c
index e21fcbccf4ba..d05ca8bc4061 100644
--- a/drivers/thermal/intel/int340x_thermal/int3406_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3406_thermal.c
@@ -12,6 +12,7 @@
#include <linux/backlight.h>
#include <linux/thermal.h>
#include <acpi/video.h>
+#include "../../../../drivers/acpi/int340x_thermal.h"
#define INT3406_BRIGHTNESS_LIMITS_CHANGED 0x80
@@ -187,7 +188,7 @@ static void int3406_thermal_remove(struct platform_device *pdev)
}
static const struct acpi_device_id int3406_thermal_match[] = {
- {"INT3406", 0},
+ ACPI_INT3406_DEVICE_IDS,
{}
};
--
2.51.0.318.gd7df087d1a-goog
