diff options
| author |   Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2024-02-07 19:40:19 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2024-02-08 11:54:39 +0000 |
| commit | 1245633c61baf159fcc1303d7f0855f49831b9c1 (patch) | |
| tree | 4eedb701ed9f5d85ae28ed0c13e24401c338b14b /drivers/input | |
| parent | Input: pxspad - follow renaming of SPI "master" to "controller" (diff) | |
| download | wireguard-linux-1245633c61baf159fcc1303d7f0855f49831b9c1.tar.xz wireguard-linux-1245633c61baf159fcc1303d7f0855f49831b9c1.zip | |
Input: synaptics-rmi4 - 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/b88413456c970a97319fa7e505768bf82966541b.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/rmi4/rmi_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c index 07c866f42296..9d92129aa432 100644 --- a/drivers/input/rmi4/rmi_spi.c +++ b/drivers/input/rmi4/rmi_spi.c @@ -375,7 +375,7 @@ static int rmi_spi_probe(struct spi_device *spi) struct rmi_device_platform_data *spi_pdata = spi->dev.platform_data; int error; - if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX) + if (spi->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) return -EINVAL; rmi_spi = devm_kzalloc(&spi->dev, sizeof(struct rmi_spi_xport), |