diff options
| author |   Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2024-06-06 16:24:22 +0200 |
|---|---|---|
| committer |   Marc Kleine-Budde <mkl@pengutronix.de> | 2024-06-21 09:46:38 +0200 |
| commit | 1562a49d000c37a3110593e072eb4faa2f83538a (patch) | |
| tree | 94decd56e8156ddaea8b097a6cd849aaf8139296 | |
| parent | Merge patch series "can: kvaser_pciefd: Support MSI interrupts" (diff) | |
| download | wireguard-linux-1562a49d000c37a3110593e072eb4faa2f83538a.tar.xz wireguard-linux-1562a49d000c37a3110593e072eb4faa2f83538a.zip | |
can: hi311x: 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-1-krzysztof.kozlowski@linaro.org
[mkl: add intermediate cast to uintptr_t]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | drivers/net/can/spi/hi311x.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c index e1b8533a602e..148d974ebb21 100644 --- a/drivers/net/can/spi/hi311x.c +++ b/drivers/net/can/spi/hi311x.c @@ -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; |