]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
can: hi311x: simplify with spi_get_device_match_data()
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Thu, 6 Jun 2024 14:24:22 +0000 (16:24 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 21 Jun 2024 07:46:38 +0000 (09:46 +0200)
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-1-krzysztof.kozlowski@linaro.org
[mkl: add intermediate cast to uintptr_t]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/spi/hi311x.c

index e1b8533a602e28a69f6401dc5561ab7827b0f1ba..148d974ebb210778cb1b0b96305a513b4e7af52c 100644 (file)
@@ -830,7 +830,6 @@ static int hi3110_can_probe(struct spi_device *spi)
        struct device *dev = &spi->dev;
        struct net_device *net;
        struct hi3110_priv *priv;
-       const void *match;
        struct clk *clk;
        u32 freq;
        int ret;
@@ -874,11 +873,7 @@ static int hi3110_can_probe(struct spi_device *spi)
                CAN_CTRLMODE_LISTENONLY |
                CAN_CTRLMODE_BERR_REPORTING;
 
-       match = device_get_match_data(dev);
-       if (match)
-               priv->model = (enum hi3110_model)(uintptr_t)match;
-       else
-               priv->model = spi_get_device_id(spi)->driver_data;
+       priv->model = (enum hi3110_model)(uintptr_t)spi_get_device_match_data(spi);
        priv->net = net;
        priv->clk = clk;