aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2025-11-29 16:07:04 +0100
committerMark Brown <broonie@kernel.org>2025-12-14 19:39:20 +0900
commite83ba2e698aafa052d0df82564f7c8cd777fd5c7 (patch)
tree37cec537ef5e83398cf6ea6d152b3e15dbde5940 /drivers
parent6f9e4740e8591176eb90bb1dae95bbbb5c7d789e (diff)
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 <andriy.shevchenko@linux.intel.com> Link: https://patch.msgid.link/20251129150704.3998301-1-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi-cadence-xspi.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index a63a3aa608c6..c4ab6b2fb43f 100644
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -11,9 +11,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>
@@ -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;