Unverified Commit 28e59d8b authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

spi: cadence-quadspi: Follow renaming of SPI "master" to "controller" 



In commit 8caab75f ("spi: Generalize SPI "master" to "controller"")
some functions and struct members were renamed. To not break all drivers
compatibility macros were provided.

To be able to remove these compatibility macros push the renaming into
this driver.

Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/d741960846b7f4896eeff91a4c8c7dfa8a6f8b7b.1707324794.git.u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e71011da

drivers/spi/spi-cadence-quadspi.c

+1 −1
Original line number Diff line number Diff line
@@ -1410,7 +1410,7 @@ static int cqspi_mem_process(struct spi_mem *mem, const struct spi_mem_op *op) 
static int cqspi_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)

{

	int ret;

	struct cqspi_st *cqspi = spi_master_get_devdata(mem->spi->master);

	struct cqspi_st *cqspi = spi_controller_get_devdata(mem->spi->controller);

	struct device *dev = &cqspi->pdev->dev;



	ret = pm_runtime_resume_and_get(dev);