kevin/linux
1
Fork 0
Code

misc: gehc-achc: Follow renaming of SPI "master" to "controller"

Browse Source 
In commit 8caab75fd2 ("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: Greg Kroah-Hartman <gregkh@linuxfoundation.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/3c93bf41d2399d06b5a379a76c8f6e877f3560b7.1707324794.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Uwe Kleine-König 2024-02-07 19:40:24 +01:00 committed by Mark Brown
parent d920b3a672
commit 26dcf09ee5
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/misc/gehc-achc.c
View File

@ -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
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)