[PATCH] firmware: arm_scmi: Drop redundant ACPI configuration guard
Sudeep Holla
sudeep.holla at kernel.org
Mon Oct 26 03:55:10 PDT 2026
Commit 98b9bfb659a9 ("ACPI: bus: Use acpi/acpi_bus.h without
CONFIG_ACPI") makes the ACPI bus helpers and their stubs available
through linux/acpi.h for all configurations.
Drop the local CONFIG_ACPI conditional around scmi_acpi_device_hid().
ACPI_COMPANION() returns NULL when ACPI is disabled, so the existing
"unknown" fallback preserves the current behavior.
Fixes: 17b3cdaa7ab4 ("firmware: arm_scmi: Fall back to ACPI HID when "compatible" is absent")
Signed-off-by: Sudeep Holla <sudeep.holla at kernel.org>
---
drivers/firmware/arm_scmi/driver.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 1e6f69b14321..6c6cb7209b13 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -3107,11 +3107,7 @@ static void scmi_debugfs_common_cleanup(void *d)
static const char *scmi_acpi_device_hid(struct acpi_device *adev)
{
-#ifdef CONFIG_ACPI
return adev ? acpi_device_hid(adev) : "unknown";
-#else
- return "unknown";
-#endif
}
static struct scmi_debug_info *scmi_debugfs_common_setup(struct scmi_info *info)
--
2.43.0
More information about the linux-arm-kernel
mailing list