can: mcp251xfd: simplify with spi_get_device_match_data()

Use spi_get_device_match_data() helper to simplify a bit the driver.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/all/20240606142424.129709-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
index 1d9057dc44f25e73e1c96f63666f8c875d06efbe..4b7e08e8ed56f0597d1fed8aa2914c02daf2b3b2 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -1989,7 +1989,6 @@ MODULE_DEVICE_TABLE(spi, mcp251xfd_id_table);
 
 static int mcp251xfd_probe(struct spi_device *spi)
 {
-       const void *match;
        struct net_device *ndev;
        struct mcp251xfd_priv *priv;
        struct gpio_desc *rx_int;
@@ -2081,13 +2080,7 @@ static int mcp251xfd_probe(struct spi_device *spi)
        priv->pll_enable = pll_enable;
        priv->reg_vdd = reg_vdd;
        priv->reg_xceiver = reg_xceiver;
-
-       match = device_get_match_data(&spi->dev);
-       if (match)
-               priv->devtype_data = *(struct mcp251xfd_devtype_data *)match;
-       else
-               priv->devtype_data = *(struct mcp251xfd_devtype_data *)
-                       spi_get_device_id(spi)->driver_data;
+       priv->devtype_data = *(struct mcp251xfd_devtype_data *)spi_get_device_match_data(spi);
 
        /* Errata Reference:
         * mcp2517fd: DS80000792C 5., mcp2518fd: DS80000789C 4.