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

misc: gehc-achc: 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 avatarGreg Kroah-Hartman <gregkh@linuxfoundation.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/3c93bf41d2399d06b5a379a76c8f6e877f3560b7.1707324794.git.u.kleine-koenig@pengutronix.deSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent d920b3a6
...@@ -65,7 +65,7 @@ static int ezport_start_programming(struct spi_device *spi, struct gpio_desc *re ...@@ -65,7 +65,7 @@ static int ezport_start_programming(struct spi_device *spi, struct gpio_desc *re
struct spi_transfer release_cs = { }; struct spi_transfer release_cs = { };
int ret; int ret;
spi_bus_lock(spi->master); spi_bus_lock(spi->controller);
/* assert chip select */ /* assert chip select */
spi_message_init(&msg); spi_message_init(&msg);
...@@ -85,16 +85,16 @@ static int ezport_start_programming(struct spi_device *spi, struct gpio_desc *re ...@@ -85,16 +85,16 @@ static int ezport_start_programming(struct spi_device *spi, struct gpio_desc *re
ret = spi_sync_locked(spi, &msg); ret = spi_sync_locked(spi, &msg);
fail: fail:
spi_bus_unlock(spi->master); spi_bus_unlock(spi->controller);
return ret; return ret;
} }
static void ezport_stop_programming(struct spi_device *spi, struct gpio_desc *reset) static void ezport_stop_programming(struct spi_device *spi, struct gpio_desc *reset)
{ {
/* reset without asserted chip select to return into normal mode */ /* reset without asserted chip select to return into normal mode */
spi_bus_lock(spi->master); spi_bus_lock(spi->controller);
ezport_reset(reset); ezport_reset(reset);
spi_bus_unlock(spi->master); spi_bus_unlock(spi->controller);
} }
static int ezport_get_status_register(struct spi_device *spi) static int ezport_get_status_register(struct spi_device *spi)
......
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