drivers: Switching NET_DEVICE_<INIT/DT_DEFINE>... macros to new ones

tbursztyka · tbursztyka · commit 3b63406ae8e7 · 2024-11-26T19:27:33.000+01:00
Switching to NET_DEVICE_INSTANCE, NET_DEVICE_INSTANCE_FROM_DT_INST,
NET_DEVICE_INSTANCE_MULTI, NET_DEVICE_INSTANCE_MULT_FROM_DT_INST,
NET_DEVICE_OFFLOAD_INSTANCE and
NET_DEVICE_OFFLOAD_INSTANCE_FROM_DT_INST.

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_stellaris.c b/drivers/ethernet/eth_stellaris.c
@@ -363,8 +363,7 @@ static const struct ethernet_api eth_stellaris_apis = {
 #endif
 };
 
-NET_DEVICE_DT_INST_DEFINE(0,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 		eth_stellaris_dev_init, NULL,
-		&eth_data, &eth_cfg, CONFIG_ETH_INIT_PRIORITY,
-		&eth_stellaris_apis, ETHERNET_L2,
+		&eth_data, &eth_cfg, &eth_stellaris_apis, ETHERNET_L2,
 		NET_L2_GET_CTX_TYPE(ETHERNET_L2), NET_ETH_MTU);
diff --git a/drivers/ieee802154/ieee802154_b91.c b/drivers/ieee802154/ieee802154_b91.c
@@ -644,8 +644,7 @@ static const struct ieee802154_radio_api b91_radio_api = {
 
 /* IEEE802154 driver registration */
 #if defined(CONFIG_NET_L2_IEEE802154) || defined(CONFIG_NET_L2_OPENTHREAD)
-NET_DEVICE_DT_INST_DEFINE(0, b91_init, NULL, &data, NULL,
-			  CONFIG_IEEE802154_B91_INIT_PRIO,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0, b91_init, NULL, &data, NULL,
 			  &b91_radio_api, L2, L2_CTX_TYPE, MTU);
 #else
 DEVICE_INSTANCE_FROM_DT_INST(0, b91_init, NULL, &data, NULL,
diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c
@@ -824,7 +824,6 @@ static const struct ieee802154_radio_api cc1200_radio_api = {
 	.attr_get		= cc1200_attr_get,
 };
 
-NET_DEVICE_DT_INST_DEFINE(0, cc1200_init, NULL, &cc1200_context_data,
-			  &cc1200_config, CONFIG_IEEE802154_CC1200_INIT_PRIO,
-			  &cc1200_radio_api, IEEE802154_L2,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0, cc1200_init, NULL, &cc1200_context_data,
+			  &cc1200_config, &cc1200_radio_api, IEEE802154_L2,
 			  NET_L2_GET_CTX_TYPE(IEEE802154_L2), 125);
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c
@@ -816,9 +816,8 @@ static struct ieee802154_cc13xx_cc26xx_data ieee802154_cc13xx_cc26xx_data = {
 #endif
 
 #if defined(CONFIG_NET_L2_IEEE802154) || defined(CONFIG_NET_L2_PHY_IEEE802154)
-NET_DEVICE_DT_INST_DEFINE(0, ieee802154_cc13xx_cc26xx_init, NULL,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0, ieee802154_cc13xx_cc26xx_init, NULL,
 			  &ieee802154_cc13xx_cc26xx_data, NULL,
-			  CONFIG_IEEE802154_CC13XX_CC26XX_INIT_PRIO,
 			  &ieee802154_cc13xx_cc26xx_radio_api, L2,
 			  L2_CTX_TYPE, MTU);
 #else
diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c
@@ -1053,9 +1053,8 @@ static struct ieee802154_cc13xx_cc26xx_subg_data ieee802154_cc13xx_cc26xx_subg_d
 };
 
 #if defined(CONFIG_NET_L2_IEEE802154)
-NET_DEVICE_DT_INST_DEFINE(0, ieee802154_cc13xx_cc26xx_subg_init, NULL,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0, ieee802154_cc13xx_cc26xx_subg_init, NULL,
 			  &ieee802154_cc13xx_cc26xx_subg_data, NULL,
-			  CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ_INIT_PRIO,
 			  &ieee802154_cc13xx_cc26xx_subg_radio_api,
 			  IEEE802154_L2, NET_L2_GET_CTX_TYPE(IEEE802154_L2),
 			  IEEE802154_MTU);
diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c
@@ -1073,9 +1073,8 @@ static const struct ieee802154_radio_api cc2520_radio_api = {
 DEVICE_INSTANCE_FROM_DT_INST(0, cc2520_init, NULL, &cc2520_context_data, NULL,
 		      POST_KERNEL, &cc2520_radio_api);
 #else
-NET_DEVICE_DT_INST_DEFINE(0, cc2520_init, NULL, &cc2520_context_data,
-			  &cc2520_config, CONFIG_IEEE802154_CC2520_INIT_PRIO,
-			  &cc2520_radio_api, IEEE802154_L2,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0, cc2520_init, NULL, &cc2520_context_data,
+			  &cc2520_config, &cc2520_radio_api, IEEE802154_L2,
 			  NET_L2_GET_CTX_TYPE(IEEE802154_L2), 125);
 #endif
 
diff --git a/drivers/ieee802154/ieee802154_dw1000.c b/drivers/ieee802154/ieee802154_dw1000.c
@@ -1679,12 +1679,11 @@ DEVICE_INSTANCE_FROM_DT_INST(0, dw1000_init, NULL,
 		    &dwt_0_context, &dw1000_0_config,
 		    POST_KERNEL, &dwt_radio_api);
 #else
-NET_DEVICE_DT_INST_DEFINE(0,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 		dw1000_init,
 		NULL,
 		&dwt_0_context,
 		&dw1000_0_config,
-		CONFIG_IEEE802154_DW1000_INIT_PRIO,
 		&dwt_radio_api,
 		IEEE802154_L2,
 		NET_L2_GET_CTX_TYPE(IEEE802154_L2),
diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c
@@ -1468,9 +1468,8 @@ DEVICE_INSTANCE_FROM_DT_INST(0, mcr20a_init, NULL, &mcr20a_context_data,
 		      &mcr20a_config, POST_KERNEL,
 		      &mcr20a_radio_api);
 #else
-NET_DEVICE_DT_INST_DEFINE(0, mcr20a_init, NULL, &mcr20a_context_data,
-			  &mcr20a_config, CONFIG_IEEE802154_MCR20A_INIT_PRIO,
-			  &mcr20a_radio_api, IEEE802154_L2,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0, mcr20a_init, NULL, &mcr20a_context_data,
+			  &mcr20a_config, &mcr20a_radio_api, IEEE802154_L2,
 			  NET_L2_GET_CTX_TYPE(IEEE802154_L2),
 			  MCR20A_PSDU_LENGTH);
 #endif
diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c
@@ -1297,8 +1297,8 @@ static const struct ieee802154_radio_api nrf5_radio_api = {
 #endif
 
 #if defined(CONFIG_NET_L2_PHY_IEEE802154)
-NET_DEVICE_DT_INST_DEFINE(0, nrf5_init, NULL, &nrf5_data, &nrf5_radio_cfg,
-			  CONFIG_IEEE802154_NRF5_INIT_PRIO, &nrf5_radio_api, L2,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0, nrf5_init, NULL, &nrf5_data, &nrf5_radio_cfg,
+			  &nrf5_radio_api, L2,
 			  L2_CTX_TYPE, MTU);
 #else
 DEVICE_INSTANCE_FROM_DT_INST(0, nrf5_init, NULL, &nrf5_data, &nrf5_radio_cfg,
diff --git a/drivers/ieee802154/ieee802154_rf2xx.c b/drivers/ieee802154/ieee802154_rf2xx.c
@@ -1160,13 +1160,12 @@ static const struct ieee802154_radio_api rf2xx_radio_api = {
 		&rf2xx_radio_api)
 
 #define IEEE802154_RF2XX_NET_DEVICE_INIT(n)	   \
-	NET_DEVICE_DT_INST_DEFINE(		   \
+	NET_DEVICE_INSTANCE_FROM_DT_INST(	   \
 		n,				   \
 		&rf2xx_init,			   \
 		NULL,				   \
 		&rf2xx_ctx_data_##n,		   \
 		&rf2xx_ctx_config_##n,		   \
-		CONFIG_IEEE802154_RF2XX_INIT_PRIO, \
 		&rf2xx_radio_api,		   \
 		L2,				   \
 		L2_CTX_TYPE,			   \
diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c
@@ -398,7 +398,7 @@ static const struct ieee802154_radio_api upipe_radio_api = {
 	.attr_get		= upipe_attr_get,
 };
 
-NET_DEVICE_DT_INST_DEFINE(0, upipe_init, NULL, &upipe_context_data, NULL,
-			  CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &upipe_radio_api,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0, upipe_init, NULL, &upipe_context_data, NULL,
+			  &upipe_radio_api,
 			  IEEE802154_L2, NET_L2_GET_CTX_TYPE(IEEE802154_L2),
 			  IEEE802154_MTU);
diff --git a/drivers/modem/hl7800.c b/drivers/modem/hl7800.c
@@ -6569,6 +6569,5 @@ static struct offloaded_if_api api_funcs = {
 	.iface_api.init = offload_iface_init,
 };
 
-NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, hl7800_init, NULL, &iface_ctx,
-				  &hl7800_cfg, CONFIG_MODEM_HL7800_INIT_PRIORITY,
-				  &api_funcs, MDM_MTU);
+NET_DEVICE_OFFLOAD_INSTANCE_FROM_DT_INST(0, hl7800_init, NULL, &iface_ctx,
+				  &hl7800_cfg, &api_funcs, MDM_MTU);
diff --git a/drivers/modem/quectel-bg9x.c b/drivers/modem/quectel-bg9x.c
@@ -1280,9 +1280,8 @@ static int modem_init(const struct device *dev)
 }
 
 /* Register the device with the Networking stack. */
-NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, modem_init, NULL,
+NET_DEVICE_OFFLOAD_INSTANCE_FROM_DT_INST(0, modem_init, NULL,
 				  &mdata, NULL,
-				  CONFIG_MODEM_QUECTEL_BG9X_INIT_PRIORITY,
 				  &api_funcs, MDM_MAX_DATA_LENGTH);
 
 /* Register NET sockets. */
diff --git a/drivers/modem/simcom-sim7080.c b/drivers/modem/simcom-sim7080.c
@@ -2429,8 +2429,8 @@ static int modem_init(const struct device *dev)
 }
 
 /* Register device with the networking stack. */
-NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, modem_init, NULL, &mdata, NULL,
-				  CONFIG_MODEM_SIMCOM_SIM7080_INIT_PRIORITY, &api_funcs,
+NET_DEVICE_OFFLOAD_INSTANCE_FROM_DT_INST(0, modem_init, NULL, &mdata, NULL,
+				  &api_funcs,
 				  MDM_MAX_DATA_LENGTH);
 
 NET_SOCKET_OFFLOAD_REGISTER(simcom_sim7080, CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY,
diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c
@@ -2238,8 +2238,7 @@ static int modem_init(const struct device *dev)
 	return ret;
 }
 
-NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, modem_init, NULL,
+NET_DEVICE_OFFLOAD_INSTANCE_FROM_DT_INST(0, modem_init, NULL,
 				  &mdata, NULL,
-				  CONFIG_MODEM_UBLOX_SARA_R4_INIT_PRIORITY,
 				  &api_funcs,
 				  MDM_MAX_DATA_LENGTH);
diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c
@@ -1781,8 +1781,7 @@ static struct offloaded_if_api api_funcs = {
 	.iface_api.init = offload_iface_init,
 };
 
-NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, wncm14a2a_init, NULL,
+NET_DEVICE_OFFLOAD_INSTANCE_FROM_DT_INST(0, wncm14a2a_init, NULL,
 				  &ictx, &wncm14a2a_cfg,
-				  CONFIG_MODEM_WNCM14A2A_INIT_PRIORITY,
 				  &api_funcs,
 				  MDM_MAX_DATA_LENGTH);
diff --git a/drivers/net/canbus.c b/drivers/net/canbus.c
@@ -158,6 +158,6 @@ static const struct net_canbus_config net_canbus_cfg = {
 	.can_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_canbus))
 };
 
-NET_DEVICE_INIT(net_canbus, "NET_CANBUS", net_canbus_init, NULL, &net_canbus_ctx, &net_canbus_cfg,
-		CONFIG_NET_CANBUS_INIT_PRIORITY, &net_canbus_api, CANBUS_RAW_L2,
+NET_DEVICE_INSTANCE(net_canbus, net_canbus_init, NULL, &net_canbus_ctx, &net_canbus_cfg,
+		&net_canbus_api, CANBUS_RAW_L2,
 		NET_L2_GET_CTX_TYPE(CANBUS_RAW_L2), CAN_MTU);
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
@@ -169,8 +169,6 @@ static struct dummy_api loopback_api = {
 	.send = loopback_send,
 };
 
-NET_DEVICE_INIT(loopback, "lo",
-		loopback_dev_init, NULL, NULL, NULL,
-		CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+NET_DEVICE_INSTANCE(loopback, loopback_dev_init, NULL, NULL, NULL,
 		&loopback_api, DUMMY_L2,
 		NET_L2_GET_CTX_TYPE(DUMMY_L2), CONFIG_NET_LOOPBACK_MTU);
diff --git a/drivers/net/nsos_sockets.c b/drivers/net/nsos_sockets.c
@@ -1578,8 +1578,7 @@ static struct offloaded_if_api nsos_iface_offload_api = {
 	.enable = nsos_iface_enable,
 };
 
-NET_DEVICE_OFFLOAD_INIT(nsos_socket, "nsos_socket",
-			nsos_socket_offload_init,
+NET_DEVICE_OFFLOAD_INSTANCE(nsos_socket, nsos_socket_offload_init,
 			NULL,
 			NULL, NULL,
-			0, &nsos_iface_offload_api, NET_ETH_MTU);
+			&nsos_iface_offload_api, NET_ETH_MTU);
diff --git a/drivers/net/ppp.c b/drivers/net/ppp.c
@@ -1151,7 +1151,7 @@ static const struct ppp_api ppp_if_api = {
 #endif
 };
 
-NET_DEVICE_INIT(ppp, CONFIG_NET_PPP_DRV_NAME, ppp_driver_init,
+NET_DEVICE_INSTANCE(ppp, ppp_driver_init,
 		NULL, &ppp_driver_context_data, NULL,
-		CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &ppp_if_api,
+		&ppp_if_api,
 		PPP_L2, NET_L2_GET_CTX_TYPE(PPP_L2), PPP_MTU);
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
@@ -426,7 +426,6 @@ static const struct dummy_api slip_if_api = {
 #define _SLIP_L2_LAYER DUMMY_L2
 #define _SLIP_L2_CTX_TYPE NET_L2_GET_CTX_TYPE(DUMMY_L2)
 
-NET_DEVICE_INIT(slip, CONFIG_SLIP_DRV_NAME, slip_init, NULL,
-		&slip_context_data, NULL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
-		&slip_if_api, _SLIP_L2_LAYER, _SLIP_L2_CTX_TYPE, _SLIP_MTU);
+NET_DEVICE_INSTANCE(slip, slip_init, NULL,
+		&slip_context_data, NULL, &slip_if_api, _SLIP_L2_LAYER, _SLIP_L2_CTX_TYPE, _SLIP_MTU);
 #endif
diff --git a/drivers/wifi/esp32/src/esp_wifi_drv.c b/drivers/wifi/esp32/src/esp_wifi_drv.c
@@ -908,17 +908,15 @@ static const struct net_wifi_mgmt_offload esp32_api = {
 	.wifi_mgmt_api = &esp32_wifi_mgmt,
 };
 
-NET_DEVICE_DT_INST_DEFINE(0,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0,
 		esp32_wifi_dev_init, NULL,
-		&esp32_data, NULL, CONFIG_WIFI_INIT_PRIORITY,
-		&esp32_api, ETHERNET_L2,
+		&esp32_data, NULL, &esp32_api, ETHERNET_L2,
 		NET_L2_GET_CTX_TYPE(ETHERNET_L2), NET_ETH_MTU);
 
 #if defined(CONFIG_ESP32_WIFI_AP_STA_MODE)
-NET_DEVICE_DT_INST_DEFINE(1,
+NET_DEVICE_INSTANCE_FROM_DT_INST(1,
 		NULL, NULL,
-		&esp32_ap_sta_data, NULL, CONFIG_WIFI_INIT_PRIORITY,
-		&esp32_api, ETHERNET_L2,
+		&esp32_ap_sta_data, NULL, &esp32_api, ETHERNET_L2,
 		NET_L2_GET_CTX_TYPE(ETHERNET_L2), NET_ETH_MTU);
 
 DEFINE_WIFI_NM_INSTANCE(esp32_wifi_nm, &esp32_wifi_mgmt);
diff --git a/drivers/wifi/esp_at/esp.c b/drivers/wifi/esp_at/esp.c
@@ -1538,9 +1538,9 @@ static int esp_init(const struct device *dev);
  * for the struct net_if that the macro declares to be visible inside the
  * function. An `extern` declaration does not work as the struct is static.
  */
-NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, esp_init, NULL,
+NET_DEVICE_OFFLOAD_INSTANCE_FROM_DT_INST(0, esp_init, NULL,
 				  &esp_driver_data, &esp_driver_config,
-				  CONFIG_WIFI_INIT_PRIORITY, &esp_api,
+				  &esp_api,
 				  ESP_MTU);
 
 CONNECTIVITY_WIFI_MGMT_BIND(Z_DEVICE_DT_DEV_ID(DT_DRV_INST(0)));
diff --git a/drivers/wifi/eswifi/eswifi_core.c b/drivers/wifi/eswifi/eswifi_core.c
@@ -811,9 +811,8 @@ static const struct net_wifi_mgmt_offload eswifi_offload_api = {
 	.wifi_mgmt_api = &eswifi_mgmt_api,
 };
 
-NET_DEVICE_DT_INST_OFFLOAD_DEFINE(0, eswifi_init, NULL,
+NET_DEVICE_OFFLOAD_INSTANCE_FROM_DT_INST(0, eswifi_init, NULL,
 				  &eswifi0, &eswifi0_cfg,
-				  CONFIG_WIFI_INIT_PRIORITY,
 				  &eswifi_offload_api,
 				  1500);
 
diff --git a/drivers/wifi/infineon/airoc_wifi.c b/drivers/wifi/infineon/airoc_wifi.c
@@ -815,8 +815,8 @@ static const struct net_wifi_mgmt_offload airoc_api = {
 	.wifi_mgmt_api = &airoc_wifi_mgmt,
 };
 
-NET_DEVICE_DT_INST_DEFINE(0, airoc_init, NULL, &airoc_wifi_data, &airoc_wifi_config,
-			  CONFIG_WIFI_INIT_PRIORITY, &airoc_api, ETHERNET_L2,
+NET_DEVICE_INSTANCE_FROM_DT_INST(0, airoc_init, NULL, &airoc_wifi_data, &airoc_wifi_config,
+			  &airoc_api, ETHERNET_L2,
 			  NET_L2_GET_CTX_TYPE(ETHERNET_L2), WHD_LINK_MTU);
 
 CONNECTIVITY_WIFI_MGMT_BIND(Z_DEVICE_DT_DEV_ID(DT_DRV_INST(0)));
diff --git a/drivers/wifi/simplelink/simplelink.c b/drivers/wifi/simplelink/simplelink.c
@@ -298,10 +298,9 @@ static int simplelink_init(const struct device *dev)
 	return 0;
 }
 
-NET_DEVICE_OFFLOAD_INIT(simplelink, CONFIG_WIFI_SIMPLELINK_NAME,
-			simplelink_init, NULL,
+NET_DEVICE_OFFLOAD_INSTANCE(simplelink, simplelink_init, NULL,
 			&simplelink_data, NULL,
-			CONFIG_WIFI_INIT_PRIORITY, &simplelink_api,
+			&simplelink_api,
 			CONFIG_WIFI_SIMPLELINK_MAX_PACKET_SIZE);
 
 CONNECTIVITY_WIFI_MGMT_BIND(simplelink);
diff --git a/drivers/wifi/winc1500/wifi_winc1500.c b/drivers/wifi/winc1500/wifi_winc1500.c
@@ -1182,9 +1182,8 @@ static int winc1500_init(const struct device *dev)
 	return 0;
 }
 
-NET_DEVICE_OFFLOAD_INIT(winc1500, CONFIG_WIFI_WINC1500_NAME,
-			winc1500_init, NULL, &w1500_data, NULL,
-			CONFIG_WIFI_INIT_PRIORITY, &winc1500_api,
+NET_DEVICE_OFFLOAD_INSTANCE(winc1500, winc1500_init, NULL, &w1500_data, NULL,
+			&winc1500_api,
 			CONFIG_WIFI_WINC1500_MAX_PACKET_SIZE);
 
 CONNECTIVITY_WIFI_MGMT_BIND(winc1500);
