From e83ba2e698aafa052d0df82564f7c8cd777fd5c7 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Sat, 29 Nov 2025 16:07:04 +0100 Subject: [PATCH] spi: cadence-xspi: Replace OF/ACPI specifics by agnostic APIs 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 Link: https://patch.msgid.link/20251129150704.3998301-1-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown --- 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 a63a3aa608c63..c4ab6b2fb43f7 100644 --- a/drivers/spi/spi-cadence-xspi.c +++ b/drivers/spi/spi-cadence-xspi.c @@ -11,9 +11,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -1143,12 +1143,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.47.3