serial: max310x: 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>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
Link: https://lore.kernel.org/r/20240118152213.2644269-5-hugo@hugovil.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c
index a051bc773c4b07815a64365f9a6fd249b030e379..2314ec2afd3f8b05e8c9898b3babda6af962e948 100644 (file)
--- a/drivers/tty/serial/max310x.c
+++ b/drivers/tty/serial/max310x.c
@@ -1514,9 +1514,9 @@ static int max310x_spi_probe(struct spi_device *spi)
        if (ret)
                return ret;
 
-       devtype = device_get_match_data(&spi->dev);
+       devtype = spi_get_device_match_data(spi);
        if (!devtype)
-               devtype = (struct max310x_devtype *)spi_get_device_id(spi)->driver_data;
+               return dev_err_probe(&spi->dev, -ENODEV, "Failed to match device\n");
 
        for (i = 0; i < devtype->nr; i++) {
                u8 port_mask = i * 0x20;