Skip to contentSkip to conversation

platform/x86/intel: punit_ipc: Drop wrong use of ACPI_PTR()

PATCH In review Andy Shevchenko 2 participants 2 messages Aug 27, 2021 – Sep 13, 2021

Subsystems (2)
x86 platform drivers Intel P-Unit IPC driver
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 platform/x86/intel: punit_ipc: Drop wrong use of ACPI_PTR()

ACPI_PTR() is more harmful than helpful. For example, in this case if CONFIG_ACPI=n, the ID table left unused which is not what we want.

Instead of adding ifdeffery here and there, drop ACPI_PTR() and unused acpi.h.

Fixes fdca4f16f57d ("platform:x86: add Intel P-Unit mailbox IPC driver")
Reported-by kernel test robot <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/platform/x86/intel/punit_ipc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/platform/x86/intel/punit_ipc.c +1 -2
index f58b8543f6ac..66bb39fd0ef9 100644
@@ -8,7 +8,6 @@
  * which provide mailbox interface for power management usage.
  */
 
-#include <linux/acpi.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/device.h>

@@ -319,7 +318,7 @@ static struct platform_driver intel_punit_ipc_driver = {
 	.remove = intel_punit_ipc_remove,
 	.driver = {
 		.name = "intel_punit_ipc",
-		.acpi_match_table = ACPI_PTR(punit_ipc_acpi_ids),
+		.acpi_match_table = punit_ipc_acpi_ids,
 	},
 };
Signature · 1 line
2.33.0
#1 lore raw

Hi,

Quoted 9 lines · Andy Shevchenko

ACPI_PTR() is more harmful than helpful. For example, in this case if CONFIG_ACPI=n, the ID table left unused which is not what we want.

Instead of adding ifdeffery here and there, drop ACPI_PTR() and unused acpi.h.

Fixes fdca4f16f57d ("platform:x86: add Intel P-Unit mailbox IPC driver")
Reported-by kernel test robot <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>

Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans

I will also add this to the fixes branch, so that it gets send out to Linus in my next pull-request with fixes for 5.15.

Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.

Regards,

Hans

Quoted 26 lines
---
 drivers/platform/x86/intel/punit_ipc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/platform/x86/intel/punit_ipc.c +1 -2
index f58b8543f6ac..66bb39fd0ef9 100644
@@ -8,7 +8,6 @@
  * which provide mailbox interface for power management usage.
  */
 
-#include <linux/acpi.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/device.h>

@@ -319,7 +318,7 @@ static struct platform_driver intel_punit_ipc_driver = {
 	.remove = intel_punit_ipc_remove,
 	.driver = {
 		.name = "intel_punit_ipc",
-		.acpi_match_table = ACPI_PTR(punit_ipc_acpi_ids),
+		.acpi_match_table = punit_ipc_acpi_ids,
 	},
 };