spi: pxa2xx: Drop ACPI_PTR() and of_match_ptr()

Drop rather useless use of ACPI_PTR() and of_match_ptr().
It also removes the necessity to be dependent of.h inclusion.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://msgid.link/r/20240327193138.2385910-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 1d43346b4436c719c8c56f026810bb0b4d5d65b4..75d2080877481bf7a39415e03cbbd98293533e76 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -19,7 +19,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
-#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/property.h>
@@ -1725,7 +1724,6 @@ static const struct dev_pm_ops pxa2xx_spi_pm_ops = {
        RUNTIME_PM_OPS(pxa2xx_spi_runtime_suspend, pxa2xx_spi_runtime_resume, NULL)
 };
 
-#ifdef CONFIG_ACPI
 static const struct acpi_device_id pxa2xx_spi_acpi_match[] = {
        { "80860F0E", LPSS_BYT_SSP },
        { "8086228E", LPSS_BSW_SSP },
@@ -1736,9 +1734,8 @@ static const struct acpi_device_id pxa2xx_spi_acpi_match[] = {
        {}
 };
 MODULE_DEVICE_TABLE(acpi, pxa2xx_spi_acpi_match);
-#endif
 
-static const struct of_device_id pxa2xx_spi_of_match[] __maybe_unused = {
+static const struct of_device_id pxa2xx_spi_of_match[] = {
        { .compatible = "marvell,mmp2-ssp", .data = (void *)MMP2_SSP },
        {}
 };
@@ -1748,8 +1745,8 @@ static struct platform_driver driver = {
        .driver = {
                .name   = "pxa2xx-spi",
                .pm     = pm_ptr(&pxa2xx_spi_pm_ops),
-               .acpi_match_table = ACPI_PTR(pxa2xx_spi_acpi_match),
-               .of_match_table = of_match_ptr(pxa2xx_spi_of_match),
+               .acpi_match_table = pxa2xx_spi_acpi_match,
+               .of_match_table = pxa2xx_spi_of_match,
        },
        .probe = pxa2xx_spi_probe,
        .remove_new = pxa2xx_spi_remove,