Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

misc: gehc-achc: 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: 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>

authored by

Uwe Kleine-König and committed by
Mark Brown
26dcf09e d920b3a6

+4 -4
+4 -4
drivers/misc/gehc-achc.c
··· 65 65 struct spi_transfer release_cs = { }; 66 66 int ret; 67 67 68 - spi_bus_lock(spi->master); 68 + spi_bus_lock(spi->controller); 69 69 70 70 /* assert chip select */ 71 71 spi_message_init(&msg); ··· 85 85 ret = spi_sync_locked(spi, &msg); 86 86 87 87 fail: 88 - spi_bus_unlock(spi->master); 88 + spi_bus_unlock(spi->controller); 89 89 return ret; 90 90 } 91 91 92 92 static void ezport_stop_programming(struct spi_device *spi, struct gpio_desc *reset) 93 93 { 94 94 /* reset without asserted chip select to return into normal mode */ 95 - spi_bus_lock(spi->master); 95 + spi_bus_lock(spi->controller); 96 96 ezport_reset(reset); 97 - spi_bus_unlock(spi->master); 97 + spi_bus_unlock(spi->controller); 98 98 } 99 99 100 100 static int ezport_get_status_register(struct spi_device *spi)