Skip to content

Commit

Permalink
Input: pxspad - follow renaming of SPI "master" to "controller"
Browse files Browse the repository at this point in the history
In commit 8caab75 ("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 <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Signed-off-by: Uwe Kleine-König <[email protected]>
Link: https://lore.kernel.org/r/820fa151077dc192391d546aec35328680803f9f.1707324794.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
Uwe Kleine-König authored and broonie committed Feb 8, 2024
1 parent 2780e7b commit a78acec
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/input/joystick/psxpad-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit a78acec

Please sign in to comment.