| Message ID | 20231009172923.2457844-5-robh@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 13266ad9e52e2e51b0f068b0251a1d5c2badae5c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: ethernet: wiznet: Use spi_get_device_match_data() | expand |
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Mon, 9 Oct 2023 12:29:00 -0500 you wrote: > Use preferred spi_get_device_match_data() instead of of_match_device() and > spi_get_device_id() to get the driver match data. With this, adjust the > includes to explicitly include the correct headers. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > drivers/net/ethernet/wiznet/w5100-spi.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) Here is the summary with links: - [net-next] net: ethernet: wiznet: Use spi_get_device_match_data() https://git.kernel.org/netdev/net-next/c/13266ad9e52e You are awesome, thank you!
diff --git a/drivers/net/ethernet/wiznet/w5100-spi.c b/drivers/net/ethernet/wiznet/w5100-spi.c index 7c52796273a4..990a3cce8c0f 100644 --- a/drivers/net/ethernet/wiznet/w5100-spi.c +++ b/drivers/net/ethernet/wiznet/w5100-spi.c @@ -14,8 +14,8 @@ #include <linux/module.h> #include <linux/delay.h> #include <linux/netdevice.h> +#include <linux/of.h> #include <linux/of_net.h> -#include <linux/of_device.h> #include <linux/spi/spi.h> #include "w5100.h" @@ -420,7 +420,6 @@ MODULE_DEVICE_TABLE(of, w5100_of_match); static int w5100_spi_probe(struct spi_device *spi) { - const struct of_device_id *of_id; const struct w5100_ops *ops; kernel_ulong_t driver_data; const void *mac = NULL; @@ -432,14 +431,7 @@ static int w5100_spi_probe(struct spi_device *spi) if (!ret) mac = tmpmac; - if (spi->dev.of_node) { - of_id = of_match_device(w5100_of_match, &spi->dev); - if (!of_id) - return -ENODEV; - driver_data = (kernel_ulong_t)of_id->data; - } else { - driver_data = spi_get_device_id(spi)->driver_data; - } + driver_data = (uintptr_t)spi_get_device_match_data(spi); switch (driver_data) { case W5100:
Use preferred spi_get_device_match_data() instead of of_match_device() and spi_get_device_id() to get the driver match data. With this, adjust the includes to explicitly include the correct headers. Signed-off-by: Rob Herring <robh@kernel.org> --- drivers/net/ethernet/wiznet/w5100-spi.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)