ACPI: DPTF: Remove int340x thermal scan handler

Using the IS_ENABLED() macro in the int340x_thermal_handler_attach()
forces the kernel to be recompiled when thermal drivers are enabled
or disabled, which is a significant limitation of its modularity.

The IS_ENABLED() macro is particularly problematic for the Android
Generic Kernel Image (GKI) project which uses unified core kernel
while SoC/board support is moved to loadable vendor modules.

The Intel Dynamic Platform and Thermal Framework (DPTF) requires
thermal drivers to be loaded at runtime, thus ACPI bus scan handler
is not needed and acpi_default_enumeration() may create all platform
devices, regardless of the actual setting of CONFIG_INT340X_THERMAL.

Signed-off-by: Slawomir Rosek <srosek@google.com>
Link: https://patch.msgid.link/20251103162516.2606158-3-srosek@google.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/dptf/Makefile b/drivers/acpi/dptf/Makefile
index 297340682f660ca304a3f31fe4ea1e5a22692996..e912a3be1d28630d28ccb64897adb6368442090d 100644 (file)
--- a/drivers/acpi/dptf/Makefile
+++ b/drivers/acpi/dptf/Makefile
@@ -1,4 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_ACPI)             += int340x_thermal.o
 obj-$(CONFIG_DPTF_POWER)       += dptf_power.o
 obj-$(CONFIG_DPTF_PCH_FIVR)    += dptf_pch_fivr.o

diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
deleted file mode 100644 (file)
index 947fe50..0000000
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ /dev/null
@@ -1,89 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * ACPI support for int340x thermal drivers
- *
- * Copyright (C) 2014, Intel Corporation
- * Authors: Zhang Rui <rui.zhang@intel.com>
- */
-
-#include <linux/acpi.h>
-#include <linux/module.h>
-
-#include "../internal.h"
-
-static const struct acpi_device_id int340x_thermal_device_ids[] = {
-       {"INT3400"},
-       {"INT3401"},
-       {"INT3402"},
-       {"INT3403"},
-       {"INT3404"},
-       {"INT3406"},
-       {"INT3407"},
-       {"INT3408"},
-       {"INT3409"},
-       {"INT340A"},
-       {"INT340B"},
-       {"INT3532"},
-       {"INTC1040"},
-       {"INTC1041"},
-       {"INTC1042"},
-       {"INTC1043"},
-       {"INTC1044"},
-       {"INTC1045"},
-       {"INTC1046"},
-       {"INTC1047"},
-       {"INTC1048"},
-       {"INTC1049"},
-       {"INTC1050"},
-       {"INTC1060"},
-       {"INTC1061"},
-       {"INTC1062"},
-       {"INTC1063"},
-       {"INTC1064"},
-       {"INTC1065"},
-       {"INTC1066"},
-       {"INTC1068"},
-       {"INTC1069"},
-       {"INTC106A"},
-       {"INTC106B"},
-       {"INTC106C"},
-       {"INTC106D"},
-       {"INTC10A0"},
-       {"INTC10A1"},
-       {"INTC10A2"},
-       {"INTC10A3"},
-       {"INTC10A4"},
-       {"INTC10A5"},
-       {"INTC10D4"},
-       {"INTC10D5"},
-       {"INTC10D6"},
-       {"INTC10D7"},
-       {"INTC10D8"},
-       {"INTC10D9"},
-       {"INTC10FC"},
-       {"INTC10FD"},
-       {"INTC10FE"},
-       {"INTC10FF"},
-       {"INTC1100"},
-       {"INTC1101"},
-       {"INTC1102"},
-       {""},
-};
-
-static int int340x_thermal_handler_attach(struct acpi_device *adev,
-                                       const struct acpi_device_id *id)
-{
-       if (IS_ENABLED(CONFIG_INT340X_THERMAL))
-               acpi_create_platform_device(adev, NULL);
-       return 1;
-}
-
-static struct acpi_scan_handler int340x_thermal_handler = {
-       .ids = int340x_thermal_device_ids,
-       .attach = int340x_thermal_handler_attach,
-};
-
-void __init acpi_int340x_thermal_init(void)
-{
-       acpi_scan_add_handler(&int340x_thermal_handler);
-}

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 63354972ab0b8af6b4ac5f7492bfef4e0dc129b0..40f875b265a94232578ba31ad9805c61e5bf0a33 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -27,7 +27,6 @@ static inline void acpi_pci_link_init(void) {}
 void acpi_processor_init(void);
 void acpi_platform_init(void);
 void acpi_pnp_init(void);
-void acpi_int340x_thermal_init(void);
 int acpi_sysfs_init(void);
 void acpi_gpe_apply_masked_gpes(void);
 void acpi_container_init(void);

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index ef16d58b29499d4faa81399c4623e6847f28229c..b74cb80ff58775940ea606a839c8d0eb213bc9c6 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2711,7 +2711,6 @@ void __init acpi_scan_init(void)
        acpi_watchdog_init();
        acpi_pnp_init();
        acpi_power_resources_init();
-       acpi_int340x_thermal_init();
        acpi_init_lpit();
 
        acpi_scan_add_handler(&generic_device_handler);