]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
spi: cadence-quadspi: Follow renaming of SPI "master" to "controller"
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 7 Feb 2024 18:40:32 +0000 (19:40 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 8 Feb 2024 11:54:49 +0000 (11:54 +0000)
In commit 8caab75fd2c2 ("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: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Uwe 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: Mark Brown <broonie@kernel.org>
drivers/spi/spi-cadence-quadspi.c

index eb6cc861b00b213c655e964dfc25b4146e9a41b2..a5e2f7786b760f35a60d46ec4e76a3008a098367 100644 (file)
@@ -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);