ethernet: Switching ETH_NET_DEVICE_<INIT/DT_INSTANCE>... to new ones

tbursztyka · tbursztyka · commit 11a38998bcd2 · 2024-11-26T19:28:06.000+01:00
Switching to ETH_NET_DEVICE_INSTANCE,
ETH_NET_DEVICE_INSTANCE_FROM_DT_INST and ETH_NET_DEVICE_INSTANCE_MULTI.

Thus removing prio and name parameters on all.

Signed-off-by: Tomasz Bursztyka &lt;tomasz.bursztyka@proton.me&gt;
diff --git a/drivers/ethernet/eth_adin2111.c b/drivers/ethernet/eth_adin2111.c
@@ -1536,10 +1536,8 @@ static const struct ethernet_api adin2111_port_api = {
 		.port_idx = port_n,								\
 		.phy_addr = phy_n,								\
 	};											\
-	ETH_NET_DEVICE_INIT_INSTANCE(name##_port_##port_n, "port_" ADIN2111_XSTR(port_n),	\
-				     port_n, NULL, NULL, &name##_port_data_##port_n,		\
-				     &name##_port_config_##port_n, CONFIG_ETH_INIT_PRIORITY,	\
-				     &adin2111_port_api, NET_ETH_MTU);
+	ETH_NET_DEVICE_INSTANCE_MULTI(name##_port_##port_n, port_n, NULL, NULL, &name##_port_data_##port_n,\
+				     &name##_port_config_##port_n, &adin2111_port_api, NET_ETH_MTU);
 
 #define ADIN2111_SPI_OPERATION ((uint16_t)(SPI_OP_MODE_MASTER | SPI_TRANSFER_MSB | SPI_WORD_SET(8)))
 #define ADIN2111_MAC_INITIALIZE(inst, dev_id, ifaces, name)					\
diff --git a/drivers/ethernet/eth_cyclonev.c b/drivers/ethernet/eth_cyclonev.c
@@ -1153,12 +1153,11 @@ const struct ethernet_api eth_cyclonev_api = {.iface_api.init = eth_cyclonev_ifa
 			.emac_index = DT_INST_PROP(inst, emac_index), \
 			.irq_config = eth_cyclonev_##inst##_irq_config, \
 	}; \
-	ETH_NET_DEVICE_DT_INST_DEFINE(inst, eth_cyclonev_probe, NULL, \
-			&eth_cyclonev_##inst##_data, \
-			&eth_cyclonev_##inst##_cfg, \
-			CONFIG_ETH_INIT_PRIORITY, \
-			&eth_cyclonev_api, \
-			NET_ETH_MTU); \
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(inst, eth_cyclonev_probe, NULL,\
+			&eth_cyclonev_##inst##_data,                  \
+			&eth_cyclonev_##inst##_cfg,                   \
+			&eth_cyclonev_api,                            \
+			NET_ETH_MTU),                                 \
  \
 	static void eth_cyclonev_##inst##_irq_config(void) \
 	{ \
diff --git a/drivers/ethernet/eth_dwmac_mmu.c b/drivers/ethernet/eth_dwmac_mmu.c
@@ -89,11 +89,10 @@ void dwmac_platform_init(struct dwmac_priv *p)
 /* Our private device instance */
 static struct dwmac_priv dwmac_instance;
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0,
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 			      dwmac_probe,
 			      NULL,
 			      &dwmac_instance,
 			      NULL,
-			      CONFIG_ETH_INIT_PRIORITY,
 			      &dwmac_api,
 			      NET_ETH_MTU);
diff --git a/drivers/ethernet/eth_dwmac_stm32h7x.c b/drivers/ethernet/eth_dwmac_stm32h7x.c
@@ -121,11 +121,10 @@ void dwmac_platform_init(struct dwmac_priv *p)
 /* Our private device instance */
 static struct dwmac_priv dwmac_instance;
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0,
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 			      dwmac_probe,
 			      NULL,
 			      &dwmac_instance,
 			      NULL,
-			      CONFIG_ETH_INIT_PRIORITY,
 			      &dwmac_api,
 			      NET_ETH_MTU);
diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c
@@ -307,12 +307,11 @@ static const struct ethernet_api e1000_api = {
 		.config_func = e1000_config_##inst,			\
 	};								\
 									\
-	ETH_NET_DEVICE_DT_INST_DEFINE(inst,				\
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(inst,			\
 				      e1000_probe,			\
 				      NULL,				\
 				      &dev_##inst,			\
 				      &config_##inst,			\
-				      CONFIG_ETH_INIT_PRIORITY,		\
 				      &e1000_api,			\
 				      NET_ETH_MTU);
 
diff --git a/drivers/ethernet/eth_enc28j60.c b/drivers/ethernet/eth_enc28j60.c
@@ -875,8 +875,7 @@ static int eth_enc28j60_init(const struct device *dev)
 		.random_mac = DT_INST_PROP(inst, zephyr_random_mac_address),                    \
 	};                                                                                         \
                                                                                                    \
-	ETH_NET_DEVICE_DT_INST_DEFINE(inst, eth_enc28j60_init, NULL, &eth_enc28j60_runtime_##inst, \
-				      &eth_enc28j60_config_##inst, CONFIG_ETH_INIT_PRIORITY,       \
-				      &api_funcs, NET_ETH_MTU);
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(inst, eth_enc28j60_init, NULL, &eth_enc28j60_runtime_##inst,\
+				      &eth_enc28j60_config_##inst, &api_funcs, NET_ETH_MTU);
 
 DT_INST_FOREACH_STATUS_OKAY(ENC28J60_DEFINE);
diff --git a/drivers/ethernet/eth_enc424j600.c b/drivers/ethernet/eth_enc424j600.c
@@ -832,7 +832,7 @@ static const struct enc424j600_config enc424j600_0_config = {
 	.timeout = CONFIG_ETH_ENC424J600_TIMEOUT,
 };
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0,
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 		    enc424j600_init, NULL,
 		    &enc424j600_0_runtime, &enc424j600_0_config,
-		    CONFIG_ETH_INIT_PRIORITY, &api_funcs, NET_ETH_MTU);
+		    &api_funcs, NET_ETH_MTU);
diff --git a/drivers/ethernet/eth_esp32.c b/drivers/ethernet/eth_esp32.c
@@ -400,11 +400,10 @@ static struct eth_esp32_dev_data eth_esp32_dev = {
 	.dma = &eth_esp32_dma_data,
 };
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0,
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 		    eth_esp32_initialize,
 		    NULL,
 		    &eth_esp32_dev,
 		    NULL,
-		    CONFIG_ETH_INIT_PRIORITY,
 		    &eth_esp32_api,
 		    NET_ETH_MTU);
diff --git a/drivers/ethernet/eth_gecko.c b/drivers/ethernet/eth_gecko.c
@@ -672,6 +672,6 @@ static struct eth_gecko_dev_data eth0_data = {
 #endif
 };
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0, eth_init,
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0, eth_init,
 		    NULL, &eth0_data, &eth0_config,
-		    CONFIG_ETH_INIT_PRIORITY, &eth_api, ETH_GECKO_MTU);
+		    &eth_api, ETH_GECKO_MTU);
diff --git a/drivers/ethernet/eth_ivshmem.c b/drivers/ethernet/eth_ivshmem.c
@@ -419,12 +419,11 @@ static const struct ethernet_api eth_ivshmem_api = {
 		.name = "ivshmem_eth" STRINGIFY(inst),					\
 		.generate_mac_addr = generate_mac_addr_##inst,				\
 	};										\
-	ETH_NET_DEVICE_DT_INST_DEFINE(inst,						\
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(inst,					\
 				      eth_ivshmem_initialize,				\
 				      NULL,						\
 				      &eth_ivshmem_dev_##inst,				\
 				      &eth_ivshmem_cfg_##inst,				\
-				      CONFIG_ETH_INIT_PRIORITY,				\
 				      &eth_ivshmem_api,					\
 				      NET_ETH_MTU);
 
diff --git a/drivers/ethernet/eth_lan865x.c b/drivers/ethernet/eth_lan865x.c
@@ -610,8 +610,7 @@ static const struct ethernet_api lan865x_api_func = {
 		.tc6 = &oa_tc6_##inst                                                              \
 	};                                                                                         \
 												   \
-	ETH_NET_DEVICE_DT_INST_DEFINE(inst, lan865x_init, NULL, &lan865x_data_##inst,              \
-				      &lan865x_config_##inst, CONFIG_ETH_INIT_PRIORITY,            \
-				      &lan865x_api_func, NET_ETH_MTU);
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(inst, lan865x_init, NULL, &lan865x_data_##inst,       \
+				      &lan865x_config_##inst, &lan865x_api_func, NET_ETH_MTU);
 
 DT_INST_FOREACH_STATUS_OKAY(LAN865X_DEFINE);
diff --git a/drivers/ethernet/eth_litex_liteeth.c b/drivers/ethernet/eth_litex_liteeth.c
@@ -350,7 +350,7 @@ static const struct ethernet_api eth_api = {
                                                                                                    \
 	};                                                                                         \
                                                                                                    \
-	ETH_NET_DEVICE_DT_INST_DEFINE(n, eth_initialize, NULL, &eth_data##n, &eth_config##n,       \
-				      CONFIG_ETH_INIT_PRIORITY, &eth_api, NET_ETH_MTU);
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(n, eth_initialize, NULL, &eth_data##n, &eth_config##n,\
+				      &eth_api, NET_ETH_MTU);
 
 DT_INST_FOREACH_STATUS_OKAY(ETH_LITEX_INIT);
diff --git a/drivers/ethernet/eth_native_posix.c b/drivers/ethernet/eth_native_posix.c
@@ -487,10 +487,8 @@ static const struct ethernet_api eth_if_api = {
 LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_ETH_DEV_DATA, (;), _);
 
 #define DEFINE_ETH_DEVICE(x, _)						\
-	ETH_NET_DEVICE_INIT(eth_native_posix_##x,			\
-			    CONFIG_ETH_NATIVE_POSIX_DRV_NAME #x,	\
+	ETH_NET_DEVICE_INSTANCE(eth_native_posix_##x,			\
 			    NULL, NULL,	&eth_context_data_##x, NULL,	\
-			    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,	\
 			    &eth_if_api,				\
 			    NET_ETH_MTU)
 
diff --git a/drivers/ethernet/eth_numaker.c b/drivers/ethernet/eth_numaker.c
@@ -785,6 +785,5 @@ static struct eth_numaker_config eth_numaker_cfg_inst = {
 	.reset = RESET_DT_SPEC_INST_GET(0),
 };
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0, eth_numaker_init, NULL, &eth_numaker_data_inst,
-			      &eth_numaker_cfg_inst, CONFIG_ETH_INIT_PRIORITY,
-			      &eth_numaker_driver_api, NET_ETH_MTU);
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0, eth_numaker_init, NULL, &eth_numaker_data_inst,
+			      &eth_numaker_cfg_inst, &eth_numaker_driver_api, NET_ETH_MTU);
diff --git a/drivers/ethernet/eth_nxp_enet_qos/eth_nxp_enet_qos_mac.c b/drivers/ethernet/eth_nxp_enet_qos/eth_nxp_enet_qos_mac.c
@@ -625,8 +625,8 @@ static const struct ethernet_api api_funcs = {
 DT_INST_FOREACH_STATUS_OKAY(NXP_ENET_QOS_DRIVER_INIT)
 
 #define NXP_ENET_QOS_MAC_DEVICE_DEFINE(n)						\
-	ETH_NET_DEVICE_DT_INST_DEFINE(n, eth_nxp_enet_qos_mac_init, NULL,		\
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(n, eth_nxp_enet_qos_mac_init, NULL,	\
 				&enet_qos_##n##_mac_data, &enet_qos_##n##_mac_config,	\
-				CONFIG_ETH_INIT_PRIORITY, &api_funcs, NET_ETH_MTU);
+				&api_funcs, NET_ETH_MTU);
 
 DT_INST_FOREACH_STATUS_OKAY(NXP_ENET_QOS_MAC_DEVICE_DEFINE)
diff --git a/drivers/ethernet/eth_nxp_imx_netc_psi.c b/drivers/ethernet/eth_nxp_imx_netc_psi.c
@@ -187,7 +187,6 @@ static const struct ethernet_api netc_eth_api = {.iface_api.init = netc_eth_ifac
 		.tx_intr_msg_data = NETC_TX_INTR_MSG_DATA_START + n,                               \
 		.rx_intr_msg_data = NETC_RX_INTR_MSG_DATA_START + n,                               \
 	};                                                                                         \
-	ETH_NET_DEVICE_DT_INST_DEFINE(n, netc_eth_init, NULL, &netc_eth##n##_data,                 \
-				      &netc_eth##n##_config, CONFIG_ETH_INIT_PRIORITY,             \
-				      &netc_eth_api, NET_ETH_MTU);
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(n, netc_eth_init, NULL, &netc_eth##n##_data,          \
+				      &netc_eth##n##_config, &netc_eth_api, NET_ETH_MTU);
 DT_INST_FOREACH_STATUS_OKAY(NETC_PSI_INSTANCE_DEFINE)
diff --git a/drivers/ethernet/eth_nxp_s32_gmac.c b/drivers/ethernet/eth_nxp_s32_gmac.c
@@ -814,12 +814,11 @@ BUILD_ASSERT((CONFIG_ETH_NXP_S32_TX_RING_BUF_SIZE % FEATURE_GMAC_DATA_BUS_WIDTH_
 											\
 	static struct eth_nxp_s32_data eth_nxp_s32_data_##n;				\
 											\
-	ETH_NET_DEVICE_DT_INST_DEFINE(n,						\
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(n,						\
 				eth_nxp_s32_init,					\
 				NULL,							\
 				&eth_nxp_s32_data_##n,					\
 				&eth_nxp_s32_config_##n,				\
-				CONFIG_ETH_INIT_PRIORITY,				\
 				&eth_api,						\
 				NET_ETH_MTU);
 
diff --git a/drivers/ethernet/eth_nxp_s32_netc_psi.c b/drivers/ethernet/eth_nxp_s32_netc_psi.c
@@ -428,12 +428,11 @@ static struct nxp_s32_eth_data nxp_s32_eth##n##_data = {				\
 	.mac_addr = DT_INST_PROP_OR(n, local_mac_address, {0}),				\
 };											\
 											\
-ETH_NET_DEVICE_DT_INST_DEFINE(n,							\
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(n,							\
 			nxp_s32_eth_initialize,						\
 			NULL,								\
 			&nxp_s32_eth##n##_data,						\
 			&nxp_s32_eth##n##_config,					\
-			CONFIG_ETH_INIT_PRIORITY,					\
 			&nxp_s32_eth_api,						\
 			NET_ETH_MTU);							\
 
diff --git a/drivers/ethernet/eth_nxp_s32_netc_vsi.c b/drivers/ethernet/eth_nxp_s32_netc_vsi.c
@@ -167,12 +167,11 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(nxp_s32_netc_vsi) == 1, "Only one VSI enabl
 		.generate_mac = nxp_s32_eth##n##_generate_mac,					\
 	};											\
 												\
-	ETH_NET_DEVICE_DT_INST_DEFINE(n,							\
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(n,							\
 				nxp_s32_eth_initialize_common,					\
 				NULL,								\
 				&nxp_s32_eth##n##_data,						\
 				&nxp_s32_eth##n##_cfg,						\
-				CONFIG_ETH_NXP_S32_VSI_INIT_PRIORITY,				\
 				&nxp_s32_eth_api,						\
 				NET_ETH_MTU);
 
diff --git a/drivers/ethernet/eth_sam_gmac.c b/drivers/ethernet/eth_sam_gmac.c
@@ -2334,9 +2334,9 @@ static struct eth_sam_dev_data eth0_data = {
 	},
 };
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0,
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 		    eth_initialize, NULL, &eth0_data,
-		    &eth0_config, CONFIG_ETH_INIT_PRIORITY, &eth_api,
+		    &eth0_config, &eth_api,
 		    GMAC_MTU);
 
 #if defined(CONFIG_PTP_CLOCK_SAM_GMAC)
diff --git a/drivers/ethernet/eth_slip_tap.c b/drivers/ethernet/eth_slip_tap.c
@@ -37,8 +37,6 @@ static const struct ethernet_api slip_if_api = {
 #define _SLIP_L2_LAYER ETHERNET_L2
 #define _SLIP_L2_CTX_TYPE NET_L2_GET_CTX_TYPE(ETHERNET_L2)
 
-ETH_NET_DEVICE_INIT(slip, CONFIG_SLIP_DRV_NAME,
-		    slip_init, NULL,
+ETH_NET_DEVICE_INSTANCE(slip, slip_init, NULL,
 		    &slip_context_data, NULL,
-		    CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
 		    &slip_if_api, _SLIP_MTU);
diff --git a/drivers/ethernet/eth_smsc91x.c b/drivers/ethernet/eth_smsc91x.c
@@ -834,10 +834,9 @@ static struct eth_config eth_0_config = {
 	.phy_dev = DEVICE_DT_GET(DT_INST_PHANDLE(0, phy_handle)),
 };
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0,
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 	eth_init, NULL, &eth_0_context,
-	&eth_0_config, CONFIG_ETH_INIT_PRIORITY,
-	&api_funcs, NET_ETH_MTU);
+	&eth_0_config, &api_funcs, NET_ETH_MTU);
 
 #undef DT_DRV_COMPAT
 #define DT_DRV_COMPAT smsc_lan91c111_mdio
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
@@ -1336,9 +1336,9 @@ static struct eth_stm32_hal_dev_data eth0_data = {
 	},
 };
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0, eth_initialize,
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0, eth_initialize,
 		    NULL, &eth0_data, &eth0_config,
-		    CONFIG_ETH_INIT_PRIORITY, &eth_api, ETH_STM32_HAL_MTU);
+		    &eth_api, ETH_STM32_HAL_MTU);
 
 #if defined(CONFIG_PTP_CLOCK_STM32_HAL)
 
diff --git a/drivers/ethernet/eth_w5500.c b/drivers/ethernet/eth_w5500.c
@@ -617,7 +617,7 @@ static const struct w5500_config w5500_0_config = {
 	.timeout = CONFIG_ETH_W5500_TIMEOUT,
 };
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0,
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 		    w5500_init, NULL,
 		    &w5500_0_runtime, &w5500_0_config,
-		    CONFIG_ETH_INIT_PRIORITY, &w5500_api_funcs, NET_ETH_MTU);
+		    &w5500_api_funcs, NET_ETH_MTU);
diff --git a/drivers/ethernet/eth_xmc4xxx.c b/drivers/ethernet/eth_xmc4xxx.c
@@ -1005,8 +1005,8 @@ static struct eth_xmc4xxx_data eth_xmc4xxx_data = {
 	.mac_addr = DT_INST_PROP_OR(0, local_mac_address, {0}),
 };
 
-ETH_NET_DEVICE_DT_INST_DEFINE(0, eth_xmc4xxx_init, NULL, &eth_xmc4xxx_data, &eth_xmc4xxx_config,
-			      CONFIG_ETH_INIT_PRIORITY, &eth_xmc4xxx_api, NET_ETH_MTU);
+ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(0, eth_xmc4xxx_init, NULL, &eth_xmc4xxx_data, &eth_xmc4xxx_config,
+			      &eth_xmc4xxx_api, NET_ETH_MTU);
 
 #if defined(CONFIG_PTP_CLOCK_XMC4XXX)
 
diff --git a/drivers/ethernet/nxp_enet/eth_mcux.c b/drivers/ethernet/nxp_enet/eth_mcux.c
@@ -1561,14 +1561,13 @@ static void eth_mcux_err_isr(const struct device *dev)
 									\
 	ETH_MCUX_PM_DEVICE_INIT(n)					\
 									\
-	ETH_NET_DEVICE_DT_INST_DEFINE(n,				\
+	ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(n,				\
 			    eth_init,					\
 			    ETH_MCUX_PM_DEVICE_GET(n),			\
 			    &eth##n##_context,				\
 			    &eth##n##_buffer_config,			\
-			    CONFIG_ETH_INIT_PRIORITY,			\
 			    &api_funcs,					\
-			    NET_ETH_MTU);				\
+			    NET_ETH_MTU),				\
 									\
 	static void eth##n##_config_func(void)				\
 	{								\
diff --git a/drivers/ethernet/nxp_enet/eth_nxp_enet.c b/drivers/ethernet/nxp_enet/eth_nxp_enet.c
@@ -1036,10 +1036,9 @@ BUILD_ASSERT(NXP_ENET_PHY_MODE(DT_DRV_INST(n)) != NXP_ENET_RGMII_MODE ||		\
 											\
 		ETH_NXP_ENET_PM_DEVICE_INIT(n)						\
 											\
-		ETH_NET_DEVICE_DT_INST_DEFINE(n, eth_nxp_enet_init,			\
+		ETH_NET_DEVICE_INSTANCE_FROM_DT_INST(n, eth_nxp_enet_init,		\
 					ETH_NXP_ENET_PM_DEVICE_GET(n),			\
 					&nxp_enet_##n##_data, &nxp_enet_##n##_config,	\
-					CONFIG_ETH_INIT_PRIORITY,			\
 					&api_funcs, NET_ETH_MTU);
 
 DT_INST_FOREACH_STATUS_OKAY(NXP_ENET_MAC_INIT)
diff --git a/tests/net/checksum_offload/src/main.c b/tests/net/checksum_offload/src/main.c
@@ -458,19 +458,15 @@ static int eth_init(const struct device *dev)
 	return 0;
 }
 
-ETH_NET_DEVICE_INIT(eth1_offloading_disabled_test,
-		    "eth1_offloading_disabled_test",
+ETH_NET_DEVICE_INSTANCE(eth1_offloading_disabled_test,
 		    eth_init, NULL,
 		    &eth_context_offloading_disabled, NULL,
-		    CONFIG_ETH_INIT_PRIORITY,
 		    &api_funcs_offloading_disabled,
 		    NET_ETH_MTU);
 
-ETH_NET_DEVICE_INIT(eth0_offloading_enabled_test,
-		    "eth0_offloading_enabled_test",
+ETH_NET_DEVICE_INSTANCE(eth0_offloading_enabled_test,
 		    eth_init, NULL,
 		    &eth_context_offloading_enabled, NULL,
-		    CONFIG_ETH_INIT_PRIORITY,
 		    &api_funcs_offloading_enabled,
 		    NET_ETH_MTU);
 
diff --git a/tests/net/ethernet_mgmt/src/main.c b/tests/net/ethernet_mgmt/src/main.c
@@ -539,9 +539,8 @@ static int eth_fake_init(const struct device *dev)
 	return 0;
 }
 
-ETH_NET_DEVICE_INIT(eth_fake, "eth_fake", eth_fake_init, NULL,
-		    &eth_fake_data, NULL, CONFIG_ETH_INIT_PRIORITY,
-		    &eth_fake_api_funcs, NET_ETH_MTU);
+ETH_NET_DEVICE_INSTANCE(eth_fake, eth_fake_init, NULL,
+		    &eth_fake_data, NULL, &eth_fake_api_funcs, NET_ETH_MTU);
 
 #if NET_LOG_LEVEL >= LOG_LEVEL_DBG
 static const char *iface2str(struct net_if *iface)
diff --git a/tests/net/hostname/src/main.c b/tests/net/hostname/src/main.c
@@ -205,9 +205,8 @@ static int eth_fake_init(const struct device *dev)
 	return 0;
 }
 
-ETH_NET_DEVICE_INIT(eth_fake, "eth_fake", eth_fake_init, NULL,
-		    &eth_fake_data, NULL, CONFIG_ETH_INIT_PRIORITY,
-		    &eth_fake_api_funcs, NET_ETH_MTU);
+ETH_NET_DEVICE_INSTANCE(eth_fake, eth_fake_init, NULL,
+		    &eth_fake_data, NULL, &eth_fake_api_funcs, NET_ETH_MTU);
 
 #if NET_LOG_LEVEL >= LOG_LEVEL_DBG
 static const char *iface2str(struct net_if *iface)
diff --git a/tests/net/iface/src/main.c b/tests/net/iface/src/main.c
@@ -268,9 +268,8 @@ static int eth_fake_init(const struct device *dev)
 	return 0;
 }
 
-ETH_NET_DEVICE_INIT(eth_fake, "eth_fake", eth_fake_init, NULL,
-		    &eth_fake_data, NULL, CONFIG_ETH_INIT_PRIORITY,
-		    &eth_fake_api_funcs, NET_ETH_MTU);
+ETH_NET_DEVICE_INSTANCE(eth_fake, eth_fake_init, NULL,
+		    &eth_fake_data, NULL, &eth_fake_api_funcs, NET_ETH_MTU);
 
 #if NET_LOG_LEVEL >= LOG_LEVEL_DBG
 static const char *iface2str(struct net_if *iface)
diff --git a/tests/net/npf/src/main.c b/tests/net/npf/src/main.c
diff --git a/tests/net/promiscuous/src/main.c b/tests/net/promiscuous/src/main.c
diff --git a/tests/net/ptp/clock/src/main.c b/tests/net/ptp/clock/src/main.c
diff --git a/tests/net/socket/af_packet/src/main.c b/tests/net/socket/af_packet/src/main.c
diff --git a/tests/net/socket/net_mgmt/src/main.c b/tests/net/socket/net_mgmt/src/main.c
diff --git a/tests/net/socket/udp/src/main.c b/tests/net/socket/udp/src/main.c
diff --git a/tests/net/tx_timestamp/src/main.c b/tests/net/tx_timestamp/src/main.c
diff --git a/tests/net/virtual/src/main.c b/tests/net/virtual/src/main.c
diff --git a/tests/net/vlan/src/main.c b/tests/net/vlan/src/main.c
diff --git a/tests/net/wifi/wifi_nm/src/main.c b/tests/net/wifi/wifi_nm/src/main.c
