| Message ID | 20230222013821.1144691-24-troykiskyboundary@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | CONFIG_IS_ENABLED vs IS_ENABLED | expand |
On Tue, 21 Feb 2023 at 18:39, Troy Kisky <troykiskyboundary@gmail.com> wrote: > > commit e524f3a449f5 ("net: Remove eth_legacy.c") > > removed struct eth_device > This prevents errors in the conversion to CONFIG_IS_ENABLED(DM_ETH). > > Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com> > --- > > arch/arm/cpu/armv7/ls102xa/fdt.c | 12 ------------ > 1 file changed, 12 deletions(-) > Again, I have the same patch, but it will be dropped once this is applied.
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index 599b7e18ef3..a5c5c780ae8 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -25,11 +25,7 @@ DECLARE_GLOBAL_DATA_PTR; void ft_fixup_enet_phy_connect_type(void *fdt) { -#ifdef CONFIG_DM_ETH struct udevice *dev; -#else - struct eth_device *dev; -#endif struct tsec_private *priv; const char *enet_path, *phy_path; char enet[16]; @@ -37,12 +33,8 @@ void ft_fixup_enet_phy_connect_type(void *fdt) int phy_node; int i = 0; uint32_t ph; -#ifdef CONFIG_DM_ETH char *name[3] = { "ethernet@2d10000", "ethernet@2d50000", "ethernet@2d90000" }; -#else - char *name[3] = { "eTSEC1", "eTSEC2", "eTSEC3" }; -#endif for (; i < ARRAY_SIZE(name); i++) { dev = eth_get_dev_by_name(name[i]); @@ -53,11 +45,7 @@ void ft_fixup_enet_phy_connect_type(void *fdt) continue; } -#ifdef CONFIG_DM_ETH priv = dev_get_priv(dev); -#else - priv = dev->priv; -#endif if (priv->flags & TSEC_SGMII) continue;
commit e524f3a449f5 ("net: Remove eth_legacy.c") removed struct eth_device This prevents errors in the conversion to CONFIG_IS_ENABLED(DM_ETH). Signed-off-by: Troy Kisky <troykiskyboundary@gmail.com> --- arch/arm/cpu/armv7/ls102xa/fdt.c | 12 ------------ 1 file changed, 12 deletions(-)