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 #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;