Commit 3da74c51 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

Merge patch series "can: hi311x: simplify with spi_get_device_match_data()" 

Simplify SPI driver by making use of spi_get_device_match_data().

Link: https://lore.kernel.org/all/20240606142424.129709-1-krzysztof.kozlowski@linaro.org


[mkl: add intermediate cast to uintptr_t]
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parents 3ba5caf3 9cdae370

drivers/net/can/spi/hi311x.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

drivers/net/can/spi/mcp251x.c

+1 −5
Original line number Diff line number Diff line
@@ -1300,7 +1300,6 @@ MODULE_DEVICE_TABLE(spi, mcp251x_id_table); 


static int mcp251x_can_probe(struct spi_device *spi)

{

	const void *match = device_get_match_data(&spi->dev);

	struct net_device *net;

	struct mcp251x_priv *priv;

	struct clk *clk;
@@ -1338,10 +1337,7 @@ static int mcp251x_can_probe(struct spi_device *spi) 
	priv->can.clock.freq = freq / 2;

	priv->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |

		CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY;

	if (match)

		priv->model = (enum mcp251x_model)(uintptr_t)match;

	else

		priv->model = spi_get_device_id(spi)->driver_data;

	priv->model = (enum mcp251x_model)(uintptr_t)spi_get_device_match_data(spi);

	priv->net = net;

	priv->clk = clk;

drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c

+1 −8
Original line number Diff line number Diff line
@@ -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.