[PATCH v1 1/1] spi: cadence-xspi: Replace OF/ACPI specifics by agnostic APIs

From: Andy Shevchenko

Date: Sat Nov 29 2025 - 10:07:07 EST


Replace OF/ACPI specific call to get matched driver data with
the agnostic one. This doesn't change functionality. While at
it, add missing property.h include, and drop now unneeded of.h.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
drivers/spi/spi-cadence-xspi.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index f2557fb7d5e5..3fc5d8e37a9e 100644
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -12,9 +12,9 @@
#include <linux/iopoll.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/property.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi-mem.h>
#include <linux/bitfield.h>
@@ -1157,12 +1157,9 @@ static int cdns_xspi_probe(struct platform_device *pdev)
SPI_MODE_0 | SPI_MODE_3;

cdns_xspi = spi_controller_get_devdata(host);
- cdns_xspi->driver_data = of_device_get_match_data(dev);
- if (!cdns_xspi->driver_data) {
- cdns_xspi->driver_data = acpi_device_get_match_data(dev);
- if (!cdns_xspi->driver_data)
- return -ENODEV;
- }
+ cdns_xspi->driver_data = device_get_match_data(dev);
+ if (!cdns_xspi->driver_data)
+ return -ENODEV;

if (cdns_xspi->driver_data->mrvl_hw_overlay) {
host->mem_ops = &marvell_xspi_mem_ops;
--
2.50.1