Commit b0a6776e authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown

mmc: mmc_spi: 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 avatarUlf Hansson <ulf.hansson@linaro.org>
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/a9c95759cf77a19c160d1d497c76ac5770c67684.1707324794.git.u.kleine-koenig@pengutronix.deSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 26dcf09e
...@@ -935,7 +935,7 @@ static void mmc_spi_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -935,7 +935,7 @@ static void mmc_spi_request(struct mmc_host *mmc, struct mmc_request *mrq)
#endif #endif
/* request exclusive bus access */ /* request exclusive bus access */
spi_bus_lock(host->spi->master); spi_bus_lock(host->spi->controller);
crc_recover: crc_recover:
/* issue command; then optionally data and stop */ /* issue command; then optionally data and stop */
...@@ -967,7 +967,7 @@ static void mmc_spi_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -967,7 +967,7 @@ static void mmc_spi_request(struct mmc_host *mmc, struct mmc_request *mrq)
} }
/* release the bus */ /* release the bus */
spi_bus_unlock(host->spi->master); spi_bus_unlock(host->spi->controller);
mmc_request_done(host->mmc, mrq); mmc_request_done(host->mmc, mrq);
} }
...@@ -1157,7 +1157,7 @@ static int mmc_spi_probe(struct spi_device *spi) ...@@ -1157,7 +1157,7 @@ static int mmc_spi_probe(struct spi_device *spi)
/* We rely on full duplex transfers, mostly to reduce /* We rely on full duplex transfers, mostly to reduce
* per-transfer overheads (by making fewer transfers). * 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; return -EINVAL;
/* MMC and SD specs only seem to care that sampling is on the /* MMC and SD specs only seem to care that sampling is on the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment