diff options
| author |  Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| 2024-02-07 19:40:18 +0100 |
|---|---|---|
| committer |  Mark Brown <broonie@kernel.org>
| 2024-02-08 11:54:38 +0000 |
| commit | a78acec53b8524593afeed7258a442adc3450818 (patch) | |
| tree | 5163b0c60b06269480563a4d9cb992eaba7f9d13 /drivers/input | |
| parent | iio: adc: ad_sigma_delta: Follow renaming of SPI "master" to "controller" (diff) | |
| download | linux-a78acec53b8524593afeed7258a442adc3450818.tar.gz linux-a78acec53b8524593afeed7258a442adc3450818.tar.bz2 linux-a78acec53b8524593afeed7258a442adc3450818.zip | |
Input: pxspad - 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: 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>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/joystick/psxpad-spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/psxpad-spi.c b/drivers/input/joystick/psxpad-spi.c index de734a927b4d..c47fc5f34bd0 100644 --- a/drivers/input/joystick/psxpad-spi.c +++ b/drivers/input/joystick/psxpad-spi.c @@ -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 */ |