drivers: stm32: clean indentation in instance definition macros #99085

etienne-lms · 2025-11-07T14:19:35Z

Clean indentation in macros used to define STM32 driver instances resources. The main issue is a missing tabulation at the beginning of the each line participating to the macro value.

No functional changes.

A few other driver would deserve equivalent changes. I've proposed them in other P-Rs that already modify the related macros content for other purposes: stm32-clk-info P-R #98995, i2s P-R #98925.

etienne-lms · 2025-11-10T07:29:20Z

SonarCloud error reports look like false positive, e.g.:
https://sonarcloud.io/project/issues?pullRequest=99085&open=AZpeyA1arbB9veztWwEP&id=zephyrproject-rtos_zephyr

mathieuchopstm

otherwise LGTM

mathieuchopstm · 2025-11-10T16:52:07Z

drivers/clock_control/clock_stm32_mco.c

+											\
+	PINCTRL_DT_INST_DEFINE(inst);							\


Suggested change

\

PINCTRL_DT_INST_DEFINE(inst); \

PINCTRL_DT_INST_DEFINE(inst); \

Unless there's a rationale for the empty line I missed?

Not really, I'm fine removing it.

mathieuchopstm · 2025-11-10T16:52:38Z

drivers/clock_control/clock_stm32_mux.c

+#define STM32_MUX_CLK_INIT(id)							\
+										\


Suggested change

#define STM32_MUX_CLK_INIT(id) \

\

#define STM32_MUX_CLK_INIT(id) \

mathieuchopstm · 2025-11-10T16:54:10Z

drivers/i2c/i2c_ll_stm32.c

+			 .n_timings = sizeof(i2c_timings_##index) /				\
+				      (sizeof(struct i2c_config_timing)),))			\


Nit: the "stray" / makes this a bit harder to understand now

Ok, i'll restore the previous way.

mathieuchopstm · 2025-11-10T16:55:51Z

drivers/pwm/pwm_stm32.c

 									       \
 	static const struct stm32_pclken pclken_##index[] =		       \
-					STM32_DT_CLOCKS(PWM(index));	      \
+					STM32_DT_CLOCKS(PWM(index));	       \


Nit: it would be better to always use tabs rather than end with spaces (general remark, as there's - alas! - no consistency across drivers...)

Suggested change

STM32_DT_CLOCKS(PWM(index)); \

STM32_DT_CLOCKS(PWM(index)); \

Indeed, I tend to preserve existing line when possible. That' said, I agree with you, I'll update the surrounding lines for consistency in this source file.

etienne-lms · 2025-11-12T10:33:38Z

drivers/clock_control/clock_stm32_mco.c

+											\
+	PINCTRL_DT_INST_DEFINE(inst);							\


Not really, I'm fine removing it.

etienne-lms · 2025-11-12T10:35:04Z

drivers/i2c/i2c_ll_stm32.c

+			 .n_timings = sizeof(i2c_timings_##index) /				\
+				      (sizeof(struct i2c_config_timing)),))			\


Ok, i'll restore the previous way.

etienne-lms · 2025-11-12T10:36:42Z

drivers/pwm/pwm_stm32.c

 									       \
 	static const struct stm32_pclken pclken_##index[] =		       \
-					STM32_DT_CLOCKS(PWM(index));	      \
+					STM32_DT_CLOCKS(PWM(index));	       \


Indeed, I tend to preserve existing line when possible. That' said, I agree with you, I'll update the surrounding lines for consistency in this source file.

etienne-lms · 2025-11-12T10:38:54Z

drivers/pwm/pwm_stm32.c

+	{									\
+		COND_CODE_1(DT_IRQ_HAS_NAME(PWM(index), cc),			\
+			    (IRQ_CONNECT_AND_ENABLE_BY_NAME(index, cc)),	\
+			    (IRQ_CONNECT_AND_ENABLE_DEFAULT(index)));		\


FYI i'll remove this trailing ;.

mathieuchopstm · 2025-11-12T12:26:36Z

drivers/i2c/i2c_ll_stm32.c

+		IF_ENABLED(DT_HAS_COMPAT_STATUS_OKAY(st_stm32_i2c_v2),				\
+			   (.timings = (const struct i2c_config_timing *)i2c_timings_##index,	\
+			    .n_timings =							\
+				sizeof(i2c_timings_##index) / (sizeof(struct i2c_config_timing)),))\


Nit:

Suggested change

sizeof(i2c_timings_##index) / (sizeof(struct i2c_config_timing)),))\

sizeof(i2c_timings_##index) / (sizeof(struct i2c_config_timing)),)) \

mathieuchopstm · 2025-11-12T12:27:06Z

drivers/i2c/i2c_ll_stm32_rtio.c

+			    .n_timings = sizeof(i2c_timings_##index) /				\
+					 (sizeof(struct i2c_config_timing)),))			\


Sorry, I missed this one. Thanks.

Clean indentation in STM32_MCO_INIT() and STM32_MUX_CLK_INIT() macros. Add after coma pclken field value in stm32_clk_mux_cfg_##id to ease possible later changes. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

Clean indentation in SDMMC_DMA_CHANNEL() macro and fix an extra line escape at last line of SDMMC_DMA_CHANNEL_INIT() macro value. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

Clean indentation in I2C_DMA_DATA_INIT() and I2C_STM32_INIT() macros. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

Clean indentation in STM32_I3C_DMA_CHANNEL_INIT() and STM32_I3C_DMA_CHANNEL() macros of STM32 I3C driver. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

Clean indentation in IRQ_CONNECT_AND_ENABLE_BY_NAME(), IRQ_CONFIG_FUNC() and IRQ_CONNECT_AND_ENABLE_DEFAULT() macros of STM32 PWM driver. Remove a useless trailing semi column character in the interrupt function defined with IRQ_CONFIG_FUNC() macro. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

Clean indentation in local macros used to define UART instances. Remove extra line escape ending CONFIG_UART_ASYNC_API() macro value. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

Simplify interrupt handler helper macros by removing STM32_UART_IRQ_HANDLER_DECL(), using STM32_UART_IRQ_HANDLER() only renamed STM32_UART_IRQ_HANDLER_DEFINE() and aggregating where the macro and STM32_UART_IRQ_HANDLER_FUNC() macro are defined. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

Clean indentation in macros used to define instances in STM32 HSEM hardware semaphore drivers. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

etienne-lms · 2025-11-12T15:42:04Z

Review comment addressed.
Rebased.

sonarqubecloud · 2025-11-12T16:08:16Z

Please retry analysis of this Pull-Request directly on SonarQube Cloud

zephyrbot added area: IPM Inter-Processor Mailbox area: UART Universal Asynchronous Receiver-Transmitter platform: STM32 ST Micro STM32 area: Clock Control area: Disk Access area: I2C area: PWM Pulse Width Modulation labels Nov 7, 2025

zephyrbot requested review from FRASTM, GeorgeCGV, anangl, danieldegrasse, dcpleung, decsny, djiatsaf-st, erwango, gautierg-st, henrikbrixandersen, jfischer-no, juickar, mathieuchopstm, nordic-krch and teburd November 7, 2025 14:21

zephyrbot assigned erwango Nov 7, 2025

etienne-lms force-pushed the stm32-macro-indent branch from 0153133 to 798a1db Compare November 7, 2025 16:39

mathieuchopstm reviewed Nov 10, 2025

View reviewed changes

etienne-lms commented Nov 12, 2025

View reviewed changes

etienne-lms force-pushed the stm32-macro-indent branch from 798a1db to e607b12 Compare November 12, 2025 11:45

zephyrbot added the area: I3C label Nov 12, 2025

mathieuchopstm previously approved these changes Nov 12, 2025

View reviewed changes

etienne-lms dismissed mathieuchopstm’s stale review via deaf7bd November 12, 2025 15:39

etienne-lms force-pushed the stm32-macro-indent branch from e607b12 to deaf7bd Compare November 12, 2025 15:39

etienne-lms added 8 commits November 12, 2025 16:39

drivers: sdmmc: stm32: clean indentation in instance init macros

218c262

Clean indentation in SDMMC_DMA_CHANNEL() macro and fix an extra line escape at last line of SDMMC_DMA_CHANNEL_INIT() macro value. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

drivers: i2c: stm32: clean indentation in instance init macros

df87006

Clean indentation in I2C_DMA_DATA_INIT() and I2C_STM32_INIT() macros. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

drivers: i3c: stm32: clean indentation in instance init macros

85a371e

Clean indentation in STM32_I3C_DMA_CHANNEL_INIT() and STM32_I3C_DMA_CHANNEL() macros of STM32 I3C driver. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

drivers: serial: stm32: clean indentation in instance init macros

2be8613

Clean indentation in local macros used to define UART instances. Remove extra line escape ending CONFIG_UART_ASYNC_API() macro value. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

drivers: ipm: stm32_hsem: clean indentation in instance init macros

25f8f7f

Clean indentation in macros used to define instances in STM32 HSEM hardware semaphore drivers. Signed-off-by: Etienne Carriere <etienne.carriere@st.com>

etienne-lms force-pushed the stm32-macro-indent branch from deaf7bd to 25f8f7f Compare November 12, 2025 15:41

decsny removed their request for review November 12, 2025 16:42

erwango requested a review from mathieuchopstm November 13, 2025 15:25

erwango approved these changes Nov 13, 2025

View reviewed changes

	\
	PINCTRL_DT_INST_DEFINE(inst); \
	PINCTRL_DT_INST_DEFINE(inst); \

	#define STM32_MUX_CLK_INIT(id) \
	\
	#define STM32_MUX_CLK_INIT(id) \

		.n_timings = sizeof(i2c_timings_##index) / \
		(sizeof(struct i2c_config_timing)),)) \

	STM32_DT_CLOCKS(PWM(index)); \
	STM32_DT_CLOCKS(PWM(index)); \

	sizeof(i2c_timings_##index) / (sizeof(struct i2c_config_timing)),))\
	sizeof(i2c_timings_##index) / (sizeof(struct i2c_config_timing)),)) \

drivers: stm32: clean indentation in instance definition macros #99085

Are you sure you want to change the base?

drivers: stm32: clean indentation in instance definition macros #99085

Uh oh!

Conversation

etienne-lms commented Nov 7, 2025

Uh oh!

etienne-lms commented Nov 10, 2025

Uh oh!

mathieuchopstm left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

etienne-lms commented Nov 12, 2025

Uh oh!

sonarqubecloud bot commented Nov 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants