diff options
| author | Hugo Villeneuve <hvilleneuve@dimonoff.com> | 2023-12-21 18:18:14 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-04 16:30:04 +0100 |
| commit | 195f01ddcc8146465dff1cbdfd592aa3c4f3ce5d (patch) | |
| tree | c6515e945e1daa2d1034ac2f9a50b6de9dcbc385 /drivers/tty/serial | |
| parent | 3504c3174bfce19bbf3b6391645f159c68ba12e9 (diff) | |
| download | linux-195f01ddcc8146465dff1cbdfd592aa3c4f3ce5d.tar.gz linux-195f01ddcc8146465dff1cbdfd592aa3c4f3ce5d.tar.bz2 linux-195f01ddcc8146465dff1cbdfd592aa3c4f3ce5d.zip | |
serial: sc16is7xx: use spi_get_device_match_data()
Use preferred spi_get_device_match_data() instead of
device_get_match_data() and spi_get_device_id() to get the driver match
data.
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
Link: https://lore.kernel.org/r/20231221231823.2327894-8-hugo@hugovil.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/sc16is7xx.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 42e1b4c70ed6..4161d692df40 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -1742,15 +1742,9 @@ static int sc16is7xx_spi_probe(struct spi_device *spi) if (ret) return ret; - if (spi->dev.of_node) { - devtype = device_get_match_data(&spi->dev); - if (!devtype) - return -ENODEV; - } else { - const struct spi_device_id *id_entry = spi_get_device_id(spi); - - devtype = (struct sc16is7xx_devtype *)id_entry->driver_data; - } + devtype = spi_get_device_match_data(spi); + if (!devtype) + return dev_err_probe(&spi->dev, -ENODEV, "Failed to match device\n"); for (i = 0; i < devtype->nr_uart; i++) { regcfg.name = sc16is7xx_regmap_name(i); |