drivers: usb: udc: stm32: use direct function calls for clock on/off

To enable/disable clocks, the UDC driver used function pointers stored in
the instance private data(!), which *could* be NULL... but in practice,
they were always initialized. Furthermore, the clock configuration is
done through Clock Control API calls so the code can be shared by all
instances.

Replace indirect calls through function pointers with direct calls to the
"priv_clock_(dis|en)able" function, which are renamed to "udc_stm32_..."
for consistency with the rest of the driver. The now-unused function
pointers are also removed from the instance data structure.

Signed-off-by: Mathieu Choplain <[email protected]>

Author: mathieuchopstm

drivers/usb/udc/udc_stm32.c

@@ -158,8 +158,6 @@ struct udc_stm32_data  {
 	uint32_t occupied_mem;
 	/* wLength of SETUP packet for s-out-status */
 	uint32_t ep0_out_wlength;
-	int (*clk_enable)(void);
-	int (*clk_disable)(void);
 	struct k_thread thread_data;
 	struct k_msgq msgq_data;
 };
@@ -193,6 +191,9 @@ struct udc_stm32_msg {
 	uint16_t rx_count;
 };
 
+static int udc_stm32_clock_enable(void);
+static int udc_stm32_clock_disable(void);
+
 static void udc_stm32_lock(const struct device *dev)
 {
 	udc_lock_internal(dev, K_FOREVER);
@@ -696,7 +697,7 @@ int udc_stm32_init(const struct device *dev)
 	const struct udc_stm32_config *cfg = dev->config;
 	HAL_StatusTypeDef status;
 
-	if (priv->clk_enable != NULL && priv->clk_enable() != 0) {
+	if (udc_stm32_clock_enable() < 0) {
 		LOG_ERR("Error enabling clock(s)");
 		return -EIO;
 	}
@@ -928,7 +929,7 @@ static int udc_stm32_shutdown(const struct device *dev)
 		/* continue anyway */
 	}
 
-	if (priv->clk_disable != NULL && priv->clk_disable() != 0) {
+	if (udc_stm32_clock_disable() < 0) {
 		LOG_ERR("Error disabling clock(s)");
 		/* continue anyway */
 	}
@@ -1239,7 +1240,7 @@ static const struct udc_stm32_config udc0_cfg  = {
 
 static struct stm32_pclken pclken[] = STM32_DT_INST_CLOCKS(0);
 
-static int priv_clock_enable(void)
+static int udc_stm32_clock_enable(void)
 {
 	const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
 
@@ -1449,7 +1450,7 @@ static int priv_clock_enable(void)
 	return 0;
 }
 
-static int priv_clock_disable(void)
+static int udc_stm32_clock_disable(void)
 {
 	const struct device *clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
 
@@ -1538,8 +1539,6 @@ static int udc_stm32_driver_init0(const struct device *dev)
 	}
 
 	priv->dev = dev;
-	priv->clk_enable = priv_clock_enable;
-	priv->clk_disable = priv_clock_disable;
 
 	k_msgq_init(&priv->msgq_data, udc_msgq_buf_0, sizeof(struct udc_stm32_msg),
 		    CONFIG_UDC_STM32_MAX_QMESSAGES);