mmc: mmc_spi: Follow renaming of SPI "master" to "controller"

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: Ulf Hansson <ulf.hansson@linaro.org>
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/a9c95759cf77a19c160d1d497c76ac5770c67684.1707324794.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index b8dda81..bf35761 100644 (file)
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -935,7 +935,7 @@ static void mmc_spi_request(struct mmc_host *mmc, struct mmc_request *mrq)
 #endif
 
        /* request exclusive bus access */
-       spi_bus_lock(host->spi->master);
+       spi_bus_lock(host->spi->controller);
 
 crc_recover:
        /* issue command; then optionally data and stop */
@@ -967,7 +967,7 @@ crc_recover:
        }
 
        /* release the bus */
-       spi_bus_unlock(host->spi->master);
+       spi_bus_unlock(host->spi->controller);
 
        mmc_request_done(host->mmc, mrq);
 }
@@ -1157,7 +1157,7 @@ static int mmc_spi_probe(struct spi_device *spi)
        /* We rely on full duplex transfers, mostly to reduce
         * per-transfer overheads (by making fewer transfers).
         */
-       if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX)
+       if (spi->controller->flags & SPI_CONTROLLER_HALF_DUPLEX)
                return -EINVAL;
 
        /* MMC and SD specs only seem to care that sampling is on the