From bdb2b9664e2500cb5785934ffa5aeafa129331c0 Mon Sep 17 00:00:00 2001 From: Pisit Sawangvonganan Date: Sat, 8 Jun 2024 14:48:52 +0700 Subject: [PATCH] drivers: clock_control: remove '&' when assigning `clock_control_xxx_init` Remove address-of operator ('&') when assigning `clock_control_xxx_init` function pointer in `DEVICE_DT_INST_DEFINE` macro. This change aims to maintain consistency among the drivers in `drivers/clock_control`, ensuring that all function pointer assignments follow the same pattern. (cherry picked from commit dc5527721ae68759f3d868f79abeba93d8292dd3) Original-Signed-off-by: Pisit Sawangvonganan GitOrigin-RevId: dc5527721ae68759f3d868f79abeba93d8292dd3 Change-Id: Iae973faa8b81422ae7f4bb5404a36843c66c8ce3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5666210 Reviewed-by: Ting Shen Tested-by: ChromeOS Prod (Robot) Tested-by: Ting Shen Commit-Queue: Ting Shen --- drivers/clock_control/beetle_clock_control.c | 2 +- drivers/clock_control/clock_control_adsp.c | 2 +- drivers/clock_control/clock_control_esp32.c | 2 +- drivers/clock_control/clock_control_ifx_cat1.c | 4 ++-- drivers/clock_control/clock_control_litex.c | 2 +- drivers/clock_control/clock_control_lpc11u6x.c | 2 +- drivers/clock_control/clock_control_mchp_xec.c | 2 +- drivers/clock_control/clock_control_mcux_pcc.c | 2 +- drivers/clock_control/clock_control_mcux_scg.c | 2 +- drivers/clock_control/clock_control_mcux_sim.c | 2 +- drivers/clock_control/clock_control_npcx.c | 2 +- drivers/clock_control/clock_control_numaker_scc.c | 2 +- drivers/clock_control/clock_control_nxp_s32.c | 2 +- drivers/clock_control/clock_control_renesas_ra.c | 2 +- drivers/clock_control/clock_control_rpi_pico.c | 2 +- drivers/clock_control/clock_control_smartbond.c | 2 +- drivers/clock_control/clock_stm32_ll_common.c | 2 +- drivers/clock_control/clock_stm32_ll_h5.c | 2 +- drivers/clock_control/clock_stm32_ll_h7.c | 2 +- drivers/clock_control/clock_stm32_ll_mp1.c | 2 +- drivers/clock_control/clock_stm32_ll_u5.c | 2 +- drivers/clock_control/clock_stm32_ll_wba.c | 2 +- drivers/clock_control/clock_stm32_mux.c | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/clock_control/beetle_clock_control.c b/drivers/clock_control/beetle_clock_control.c index ab4573f9afc..33f202cbb2b 100644 --- a/drivers/clock_control/beetle_clock_control.c +++ b/drivers/clock_control/beetle_clock_control.c @@ -243,7 +243,7 @@ static const struct beetle_clock_control_cfg_t beetle_cc_cfg = { * @brief Clock Control device init * */ -DEVICE_DT_INST_DEFINE(0, &beetle_clock_control_init, NULL, +DEVICE_DT_INST_DEFINE(0, beetle_clock_control_init, NULL, NULL, &beetle_cc_cfg, PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &beetle_clock_control_api); diff --git a/drivers/clock_control/clock_control_adsp.c b/drivers/clock_control/clock_control_adsp.c index adcab94b9a7..b48cfceefe3 100644 --- a/drivers/clock_control/clock_control_adsp.c +++ b/drivers/clock_control/clock_control_adsp.c @@ -28,6 +28,6 @@ static const struct clock_control_driver_api cavs_clock_api = { .set_rate = cavs_clock_ctrl_set_rate }; -DEVICE_DT_DEFINE(DT_NODELABEL(clkctl), &cavs_clock_ctrl_init, NULL, +DEVICE_DT_DEFINE(DT_NODELABEL(clkctl), cavs_clock_ctrl_init, NULL, NULL, NULL, POST_KERNEL, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &cavs_clock_api); diff --git a/drivers/clock_control/clock_control_esp32.c b/drivers/clock_control/clock_control_esp32.c index 02cf64d52b5..5506336a768 100644 --- a/drivers/clock_control/clock_control_esp32.c +++ b/drivers/clock_control/clock_control_esp32.c @@ -696,7 +696,7 @@ static const struct esp32_clock_config esp32_clock_config0 = { }; DEVICE_DT_DEFINE(DT_NODELABEL(rtc), - &clock_control_esp32_init, + clock_control_esp32_init, NULL, NULL, &esp32_clock_config0, diff --git a/drivers/clock_control/clock_control_ifx_cat1.c b/drivers/clock_control/clock_control_ifx_cat1.c index 4d8f4603b44..1d89ed0fbe0 100644 --- a/drivers/clock_control/clock_control_ifx_cat1.c +++ b/drivers/clock_control/clock_control_ifx_cat1.c @@ -715,7 +715,7 @@ static const struct clock_control_driver_api clock_control_infineon_cat1_api = { #if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_imo), okay) DEVICE_DT_DEFINE(DT_NODELABEL(clk_imo), - &clock_control_infineon_cat1_init, + clock_control_infineon_cat1_init, NULL, NULL, NULL, @@ -725,7 +725,7 @@ DEVICE_DT_DEFINE(DT_NODELABEL(clk_imo), #endif #if DT_NODE_HAS_STATUS(DT_NODELABEL(clk_iho), okay) DEVICE_DT_DEFINE(DT_NODELABEL(clk_iho), - &clock_control_infineon_cat1_init, + clock_control_infineon_cat1_init, NULL, NULL, NULL, diff --git a/drivers/clock_control/clock_control_litex.c b/drivers/clock_control/clock_control_litex.c index 06d3d1264ba..8f68dc33f7d 100644 --- a/drivers/clock_control/clock_control_litex.c +++ b/drivers/clock_control/clock_control_litex.c @@ -1794,6 +1794,6 @@ static const struct litex_clk_device ldev_init = { .nclkout = NCLKOUT }; -DEVICE_DT_DEFINE(DT_NODELABEL(clock0), &litex_clk_init, NULL, +DEVICE_DT_DEFINE(DT_NODELABEL(clock0), litex_clk_init, NULL, NULL, &ldev_init, POST_KERNEL, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &litex_clk_api); diff --git a/drivers/clock_control/clock_control_lpc11u6x.c b/drivers/clock_control/clock_control_lpc11u6x.c index c9bbf3c6a87..554ec072d4d 100644 --- a/drivers/clock_control/clock_control_lpc11u6x.c +++ b/drivers/clock_control/clock_control_lpc11u6x.c @@ -355,7 +355,7 @@ static const struct lpc11u6x_syscon_config syscon_config = { static struct lpc11u6x_syscon_data syscon_data; DEVICE_DT_INST_DEFINE(0, - &lpc11u6x_syscon_init, + lpc11u6x_syscon_init, NULL, &syscon_data, &syscon_config, PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, diff --git a/drivers/clock_control/clock_control_mchp_xec.c b/drivers/clock_control/clock_control_mchp_xec.c index f24c2e896fb..04e0286fdb9 100644 --- a/drivers/clock_control/clock_control_mchp_xec.c +++ b/drivers/clock_control/clock_control_mchp_xec.c @@ -1090,7 +1090,7 @@ const struct xec_pcr_config pcr_xec_config = { }; DEVICE_DT_INST_DEFINE(0, - &xec_clock_control_init, + xec_clock_control_init, NULL, NULL, &pcr_xec_config, PRE_KERNEL_1, diff --git a/drivers/clock_control/clock_control_mcux_pcc.c b/drivers/clock_control/clock_control_mcux_pcc.c index 287bd6df1ec..34740c19213 100644 --- a/drivers/clock_control/clock_control_mcux_pcc.c +++ b/drivers/clock_control/clock_control_mcux_pcc.c @@ -143,7 +143,7 @@ static uint32_t clocks[] = {}; }; \ \ DEVICE_DT_INST_DEFINE(inst, \ - &mcux_pcc_init, \ + mcux_pcc_init, \ NULL, \ NULL, &mcux_pcc##inst##_config, \ PRE_KERNEL_1, \ diff --git a/drivers/clock_control/clock_control_mcux_scg.c b/drivers/clock_control/clock_control_mcux_scg.c index 2898766e452..5642aabe8dd 100644 --- a/drivers/clock_control/clock_control_mcux_scg.c +++ b/drivers/clock_control/clock_control_mcux_scg.c @@ -151,7 +151,7 @@ static const struct clock_control_driver_api mcux_scg_driver_api = { }; DEVICE_DT_INST_DEFINE(0, - &mcux_scg_init, + mcux_scg_init, NULL, NULL, NULL, PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, diff --git a/drivers/clock_control/clock_control_mcux_sim.c b/drivers/clock_control/clock_control_mcux_sim.c index 8fdaa4a0ac5..26c9a3c1c2a 100644 --- a/drivers/clock_control/clock_control_mcux_sim.c +++ b/drivers/clock_control/clock_control_mcux_sim.c @@ -110,7 +110,7 @@ static const struct clock_control_driver_api mcux_sim_driver_api = { }; DEVICE_DT_DEFINE(NXP_KINETIS_SIM_NODE, - &mcux_sim_init, + mcux_sim_init, NULL, NULL, NULL, PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, diff --git a/drivers/clock_control/clock_control_npcx.c b/drivers/clock_control/clock_control_npcx.c index 3875b28da70..203a6dc69a8 100644 --- a/drivers/clock_control/clock_control_npcx.c +++ b/drivers/clock_control/clock_control_npcx.c @@ -256,7 +256,7 @@ const struct npcx_pcc_config pcc_config = { }; DEVICE_DT_INST_DEFINE(0, - &npcx_clock_control_init, + npcx_clock_control_init, NULL, NULL, &pcc_config, PRE_KERNEL_1, diff --git a/drivers/clock_control/clock_control_numaker_scc.c b/drivers/clock_control/clock_control_numaker_scc.c index af36931e00d..c8dd340eaef 100644 --- a/drivers/clock_control/clock_control_numaker_scc.c +++ b/drivers/clock_control/clock_control_numaker_scc.c @@ -156,7 +156,7 @@ static int numaker_scc_init(const struct device *dev) .core_clock = DT_INST_PROP_OR(inst, core_clock, 0), \ }; \ \ - DEVICE_DT_INST_DEFINE(inst, &numaker_scc_init, NULL, NULL, &numaker_scc_config_##inst, \ + DEVICE_DT_INST_DEFINE(inst, numaker_scc_init, NULL, NULL, &numaker_scc_config_##inst, \ PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &numaker_scc_api); DT_INST_FOREACH_STATUS_OKAY(NUMICRO_SCC_INIT); diff --git a/drivers/clock_control/clock_control_nxp_s32.c b/drivers/clock_control/clock_control_nxp_s32.c index eb10a2336ec..89e9c67cc5c 100644 --- a/drivers/clock_control/clock_control_nxp_s32.c +++ b/drivers/clock_control/clock_control_nxp_s32.c @@ -74,7 +74,7 @@ static const struct clock_control_driver_api nxp_s32_clock_driver_api = { }; DEVICE_DT_INST_DEFINE(0, - &nxp_s32_clock_init, + nxp_s32_clock_init, NULL, NULL, NULL, PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &nxp_s32_clock_driver_api); diff --git a/drivers/clock_control/clock_control_renesas_ra.c b/drivers/clock_control/clock_control_renesas_ra.c index 072687ad267..26bb3ab3eb7 100644 --- a/drivers/clock_control/clock_control_renesas_ra.c +++ b/drivers/clock_control/clock_control_renesas_ra.c @@ -304,5 +304,5 @@ static int clock_control_ra_init(const struct device *dev) return 0; } -DEVICE_DT_INST_DEFINE(0, &clock_control_ra_init, NULL, NULL, NULL, PRE_KERNEL_1, +DEVICE_DT_INST_DEFINE(0, clock_control_ra_init, NULL, NULL, NULL, PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &ra_clock_control_driver_api); diff --git a/drivers/clock_control/clock_control_rpi_pico.c b/drivers/clock_control/clock_control_rpi_pico.c index 4deec67423b..b0bcb9ca517 100644 --- a/drivers/clock_control/clock_control_rpi_pico.c +++ b/drivers/clock_control/clock_control_rpi_pico.c @@ -880,6 +880,6 @@ static struct clock_control_rpi_pico_data clock_control_rpi_pico_data = { .rosc_ph_freq = CLOCK_FREQ(rosc_ph), }; -DEVICE_DT_INST_DEFINE(0, &clock_control_rpi_pico_init, NULL, &clock_control_rpi_pico_data, +DEVICE_DT_INST_DEFINE(0, clock_control_rpi_pico_init, NULL, &clock_control_rpi_pico_data, &clock_control_rpi_pico_config, PRE_KERNEL_1, CONFIG_CLOCK_CONTROL_INIT_PRIORITY, &clock_control_rpi_pico_api); diff --git a/drivers/clock_control/clock_control_smartbond.c b/drivers/clock_control/clock_control_smartbond.c index 91183af6069..ed0cc205264 100644 --- a/drivers/clock_control/clock_control_smartbond.c +++ b/drivers/clock_control/clock_control_smartbond.c @@ -637,7 +637,7 @@ static int smartbond_clocks_pm_action(const struct device *dev, enum pm_device_a PM_DEVICE_DT_DEFINE(DT_NODELABEL(osc), smartbond_clocks_pm_action); DEVICE_DT_DEFINE(DT_NODELABEL(osc), - &smartbond_clocks_init, + smartbond_clocks_init, PM_DEVICE_DT_GET(DT_NODELABEL(osc)), NULL, NULL, PRE_KERNEL_1, diff --git a/drivers/clock_control/clock_stm32_ll_common.c b/drivers/clock_control/clock_stm32_ll_common.c index be4c30a5aba..3188725cc40 100644 --- a/drivers/clock_control/clock_stm32_ll_common.c +++ b/drivers/clock_control/clock_stm32_ll_common.c @@ -867,7 +867,7 @@ void __weak config_regulator_voltage(uint32_t hclk_freq) {} * that the device init runs just after SOC init */ DEVICE_DT_DEFINE(DT_NODELABEL(rcc), - &stm32_clock_control_init, + stm32_clock_control_init, NULL, NULL, NULL, PRE_KERNEL_1, diff --git a/drivers/clock_control/clock_stm32_ll_h5.c b/drivers/clock_control/clock_stm32_ll_h5.c index 5f9ffdcc5b8..385ee909863 100644 --- a/drivers/clock_control/clock_stm32_ll_h5.c +++ b/drivers/clock_control/clock_stm32_ll_h5.c @@ -772,7 +772,7 @@ int stm32_clock_control_init(const struct device *dev) * that the device init runs just after SOC init */ DEVICE_DT_DEFINE(DT_NODELABEL(rcc), - &stm32_clock_control_init, + stm32_clock_control_init, NULL, NULL, NULL, PRE_KERNEL_1, diff --git a/drivers/clock_control/clock_stm32_ll_h7.c b/drivers/clock_control/clock_stm32_ll_h7.c index bdbdf860e22..c487ef43fa0 100644 --- a/drivers/clock_control/clock_stm32_ll_h7.c +++ b/drivers/clock_control/clock_stm32_ll_h7.c @@ -1151,7 +1151,7 @@ void HAL_RCC_CSSCallback(void) * that the device init runs just after SOC init */ DEVICE_DT_DEFINE(DT_NODELABEL(rcc), - &stm32_clock_control_init, + stm32_clock_control_init, NULL, NULL, NULL, PRE_KERNEL_1, diff --git a/drivers/clock_control/clock_stm32_ll_mp1.c b/drivers/clock_control/clock_stm32_ll_mp1.c index e0ffedda3a8..261ca94da18 100644 --- a/drivers/clock_control/clock_stm32_ll_mp1.c +++ b/drivers/clock_control/clock_stm32_ll_mp1.c @@ -410,7 +410,7 @@ static int stm32_clock_control_init(const struct device *dev) * that the device init runs just after SOC init */ DEVICE_DT_DEFINE(DT_NODELABEL(rcc), - &stm32_clock_control_init, + stm32_clock_control_init, NULL, NULL, NULL, PRE_KERNEL_1, diff --git a/drivers/clock_control/clock_stm32_ll_u5.c b/drivers/clock_control/clock_stm32_ll_u5.c index 2c7e12f2872..bec41e21f65 100644 --- a/drivers/clock_control/clock_stm32_ll_u5.c +++ b/drivers/clock_control/clock_stm32_ll_u5.c @@ -903,7 +903,7 @@ int stm32_clock_control_init(const struct device *dev) * that the device init runs just after SOC init */ DEVICE_DT_DEFINE(DT_NODELABEL(rcc), - &stm32_clock_control_init, + stm32_clock_control_init, NULL, NULL, NULL, PRE_KERNEL_1, diff --git a/drivers/clock_control/clock_stm32_ll_wba.c b/drivers/clock_control/clock_stm32_ll_wba.c index ceb528ccd70..37d96a8078a 100644 --- a/drivers/clock_control/clock_stm32_ll_wba.c +++ b/drivers/clock_control/clock_stm32_ll_wba.c @@ -610,7 +610,7 @@ int stm32_clock_control_init(const struct device *dev) * that the device init runs just after SOC init */ DEVICE_DT_DEFINE(DT_NODELABEL(rcc), - &stm32_clock_control_init, + stm32_clock_control_init, NULL, NULL, NULL, PRE_KERNEL_1, diff --git a/drivers/clock_control/clock_stm32_mux.c b/drivers/clock_control/clock_stm32_mux.c index 73c1caf6e63..2616c0e2750 100644 --- a/drivers/clock_control/clock_stm32_mux.c +++ b/drivers/clock_control/clock_stm32_mux.c @@ -40,7 +40,7 @@ static const struct stm32_clk_mux_config stm32_clk_mux_cfg_##id = { \ .pclken = STM32_CLOCK_INFO(0, DT_DRV_INST(id)) \ }; \ \ -DEVICE_DT_INST_DEFINE(id, &stm32_clk_mux_init, NULL, \ +DEVICE_DT_INST_DEFINE(id, stm32_clk_mux_init, NULL, \ NULL, &stm32_clk_mux_cfg_##id, \ PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_OBJECTS,\ NULL);