]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Input: pxspad - follow renaming of SPI "master" to "controller"
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 7 Feb 2024 18:40:18 +0000 (19:40 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 8 Feb 2024 11:54:38 +0000 (11:54 +0000)
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: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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/820fa151077dc192391d546aec35328680803f9f.1707324794.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/input/joystick/psxpad-spi.c

index de734a927b4d9781284a201125f78cb6a8c0248f..c47fc5f34bd0cf675a1ff8b04b7160364fade186 100644 (file)
@@ -342,8 +342,8 @@ static int psxpad_spi_probe(struct spi_device *spi)
        spi->mode = SPI_MODE_3;
        spi->bits_per_word = 8;
        /* (PlayStation 1/2 joypad might be possible works 250kHz/500kHz) */
-       spi->master->min_speed_hz = 125000;
-       spi->master->max_speed_hz = 125000;
+       spi->controller->min_speed_hz = 125000;
+       spi->controller->max_speed_hz = 125000;
        spi_setup(spi);
 
        /* pad settings */