drivers: ethernet: Move back hal_init_v2 to driver init

Since phy init is not in this function anymore, it can be moved back
to driver initialization function.

While I'm at, harmonize v1/v2 flavors of the function.

Signed-off-by: Erwan Gouriou <[email protected]>

Author: erwango

drivers/ethernet/eth_stm32_hal_common.c

@@ -217,13 +217,11 @@ static int eth_initialize(const struct device *dev)
 
 	heth->Init.MACAddr = dev_data->mac_addr;
 
-#if defined(CONFIG_ETH_STM32_HAL_API_V1)
 	ret = eth_stm32_hal_init(dev);
 	if (ret) {
 		LOG_ERR("Failed to initialize HAL");
 		return -EIO;
 	}
-#endif /* !CONFIG_ETH_STM32_HAL_API_V1 */
 
 	LOG_DBG("MAC %02x:%02x:%02x:%02x:%02x:%02x",
 		dev_data->mac_addr[0], dev_data->mac_addr[1],
@@ -325,14 +323,6 @@ static void eth_iface_init(struct net_if *iface)
 
 	ethernet_init(iface);
 
-#if defined(CONFIG_ETH_STM32_HAL_API_V2)
-	/* This function requires the Ethernet interface to be
-	 * properly initialized. In auto-negotiation mode, it reads the speed
-	 * and duplex settings to configure the driver accordingly.
-	 */
-	eth_stm32_hal_init(dev);
-#endif /* CONFIG_ETH_STM32_HAL_API_V2 */
-
 	eth_stm32_setup_mac_filter(heth);
 
 	net_if_carrier_off(iface);

drivers/ethernet/eth_stm32_hal_v1.c

@@ -190,7 +190,6 @@ int eth_stm32_hal_init(const struct device *dev)
 	struct eth_stm32_hal_dev_data *dev_data = dev->data;
 	ETH_HandleTypeDef *heth = &dev_data->heth;
 	HAL_StatusTypeDef hal_ret = HAL_OK;
-	int ret = 0;
 
 	if (!ETH_STM32_AUTO_NEGOTIATION_ENABLE) {
 		struct phy_link_state state;
@@ -223,7 +222,7 @@ int eth_stm32_hal_init(const struct device *dev)
 	HAL_ETH_DMARxDescListInit(heth, dma_rx_desc_tab,
 		&dma_rx_buffer[0][0], ETH_RXBUFNB);
 
-	return ret;
+	return 0;
 }
 
 void eth_stm32_set_mac_config(const struct device *dev, struct phy_link_state *state)

drivers/ethernet/eth_stm32_hal_v2.c

@@ -476,9 +476,9 @@ void HAL_ETH_ErrorCallback(ETH_HandleTypeDef *heth)
 
 int eth_stm32_hal_init(const struct device *dev)
 {
-	HAL_StatusTypeDef hal_ret = HAL_OK;
 	struct eth_stm32_hal_dev_data *dev_data = dev->data;
 	ETH_HandleTypeDef *heth = &dev_data->heth;
+	HAL_StatusTypeDef hal_ret = HAL_OK;
 
 #if DT_HAS_COMPAT_STATUS_OKAY(st_stm32n6_ethernet)
 	for (int ch = 0; ch < ETH_DMA_CH_CNT; ch++) {