spi: cadence-xspi: Replace OF/ACPI specifics by agnostic APIs
PATCH 1/1 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.
--- drivers/spi/spi-cadence-xspi.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/spi/spi-cadence-xspi.c +4 -7
@@ -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;
Signature · 1 line
2.50.1
Mark Brown
maintainerQuoted 5 lines · Andy Shevchenko
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.hinclude, and drop now unneededof.h.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: cadence-xspi: Replace OF/ACPI specifics by agnostic APIs
commit: e83ba2e698aafa052d0df82564f7c8cd777fd5c7
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark