This is an automated email from the ASF dual-hosted git repository.
xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new f27749b1b73 arch/stm32/serial: simplify ifdefs in ioctl
f27749b1b73 is described below
commit f27749b1b7339676bde10ec6852c9a7082fbaee3
Author: raiden00pl <[email protected]>
AuthorDate: Mon Jul 6 14:00:14 2026 +0200
arch/stm32/serial: simplify ifdefs in ioctl
Simplify complex ifdefs by using UNUSED.
The current conditions do not cover all cases anyway,
and adding more conditions only complicates the code.
Signed-off-by: raiden00pl <[email protected]>
---
arch/arm/src/common/stm32/stm32_serial_m0_v3.c | 16 ++++++++--------
arch/arm/src/common/stm32/stm32_serial_m0_v4.c | 12 ++++--------
arch/arm/src/common/stm32/stm32_serial_m3m4_v1v2v3v4.c | 14 ++++----------
arch/arm/src/stm32f7/stm32_serial.c | 9 ++++-----
arch/arm/src/stm32h5/stm32_serial.c | 17 ++++++++---------
arch/arm/src/stm32h7/stm32_serial.c | 12 ++++--------
arch/arm/src/stm32l4/stm32l4_serial.c | 17 ++++++++---------
arch/arm/src/stm32l5/stm32l5_serial.c | 17 ++++++++---------
arch/arm/src/stm32n6/stm32_serial.c | 17 ++++++++---------
arch/arm/src/stm32u5/stm32_serial.c | 17 ++++++++---------
arch/arm/src/stm32wb/stm32wb_serial.c | 16 ++++++++--------
arch/arm/src/stm32wl5/stm32wl5_serial.c | 17 ++++++++---------
12 files changed, 80 insertions(+), 101 deletions(-)
diff --git a/arch/arm/src/common/stm32/stm32_serial_m0_v3.c
b/arch/arm/src/common/stm32/stm32_serial_m0_v3.c
index 504e31b9c49..c9bb8c8a37e 100644
--- a/arch/arm/src/common/stm32/stm32_serial_m0_v3.c
+++ b/arch/arm/src/common/stm32/stm32_serial_m0_v3.c
@@ -1582,14 +1582,14 @@ static int up_interrupt(int irq, void *context, void
*arg)
static int stm32serial_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT)
- struct inode *inode = filep->f_inode;
- struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS)
- struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
-#endif
- int ret = OK;
+ struct inode *inode = filep->f_inode;
+ struct uart_dev_s *dev = inode->i_private;
+ struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
+ int ret = OK;
+
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
switch (cmd)
{
diff --git a/arch/arm/src/common/stm32/stm32_serial_m0_v4.c
b/arch/arm/src/common/stm32/stm32_serial_m0_v4.c
index feb3307bc6d..56a4fd26960 100644
--- a/arch/arm/src/common/stm32/stm32_serial_m0_v4.c
+++ b/arch/arm/src/common/stm32/stm32_serial_m0_v4.c
@@ -1206,19 +1206,15 @@ static int up_interrupt(int irq, void *context, void
*arg)
static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) \
- || defined(CONFIG_STM32_USART_SINGLEWIRE) \
- || defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT)
struct inode *inode = filep->f_inode;
struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS) \
- || defined(CONFIG_STM32_USART_SINGLEWIRE) \
- || defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT)
struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
-#endif
int ret = OK;
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
+
switch (cmd)
{
#ifdef CONFIG_SERIAL_TIOCSERGSTRUCT
diff --git a/arch/arm/src/common/stm32/stm32_serial_m3m4_v1v2v3v4.c
b/arch/arm/src/common/stm32/stm32_serial_m3m4_v1v2v3v4.c
index c5b3f861d10..01db9584eaf 100644
--- a/arch/arm/src/common/stm32/stm32_serial_m3m4_v1v2v3v4.c
+++ b/arch/arm/src/common/stm32/stm32_serial_m3m4_v1v2v3v4.c
@@ -2494,21 +2494,15 @@ static int up_interrupt(int irq, void *context, void
*arg)
static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) \
- || defined(CONFIG_SERIAL_TIOCGICOUNT) \
- || defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT) \
- || defined(CONFIG_STM32_USART_SINGLEWIRE)
struct inode *inode = filep->f_inode;
struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS) \
- || defined(CONFIG_SERIAL_TIOCGICOUNT) \
- || defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT) \
- || defined(CONFIG_STM32_USART_SINGLEWIRE)
struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
-#endif
int ret = OK;
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
+
switch (cmd)
{
#ifdef CONFIG_SERIAL_TIOCSERGSTRUCT
diff --git a/arch/arm/src/stm32f7/stm32_serial.c
b/arch/arm/src/stm32f7/stm32_serial.c
index c73b64b0548..1a16240bae7 100644
--- a/arch/arm/src/stm32f7/stm32_serial.c
+++ b/arch/arm/src/stm32f7/stm32_serial.c
@@ -2404,16 +2404,15 @@ static int up_interrupt(int irq, void *context, void
*arg)
static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) \
- || defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT)
struct inode *inode = filep->f_inode;
struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT)
struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
-#endif
int ret = OK;
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
+
switch (cmd)
{
#ifdef CONFIG_SERIAL_TIOCSERGSTRUCT
diff --git a/arch/arm/src/stm32h5/stm32_serial.c
b/arch/arm/src/stm32h5/stm32_serial.c
index b46d7944366..c3ac82cfad2 100644
--- a/arch/arm/src/stm32h5/stm32_serial.c
+++ b/arch/arm/src/stm32h5/stm32_serial.c
@@ -2803,15 +2803,14 @@ static inline int stm32serial_get_rs485_mode(struct
stm32_serial_s *priv,
static int stm32serial_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT)
- struct inode *inode = filep->f_inode;
- struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS)
- struct stm32_serial_s *priv =
- (struct stm32_serial_s *)dev->priv;
-#endif
- int ret = OK;
+ struct inode *inode = filep->f_inode;
+ struct uart_dev_s *dev = inode->i_private;
+ struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
+ int ret = OK;
+
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
switch (cmd)
{
diff --git a/arch/arm/src/stm32h7/stm32_serial.c
b/arch/arm/src/stm32h7/stm32_serial.c
index cf668117e80..d4f039244bc 100644
--- a/arch/arm/src/stm32h7/stm32_serial.c
+++ b/arch/arm/src/stm32h7/stm32_serial.c
@@ -2591,19 +2591,15 @@ static int up_interrupt(int irq, void *context, void
*arg)
static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) \
- || defined(CONFIG_STM32_USART_SINGLEWIRE) \
- || defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT)
struct inode *inode = filep->f_inode;
struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS) \
- || defined(CONFIG_STM32_USART_SINGLEWIRE) \
- || defined(CONFIG_STM32_SERIALBRK_BSDCOMPAT)
struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
-#endif
int ret = OK;
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
+
switch (cmd)
{
#ifdef CONFIG_SERIAL_TIOCSERGSTRUCT
diff --git a/arch/arm/src/stm32l4/stm32l4_serial.c
b/arch/arm/src/stm32l4/stm32l4_serial.c
index 1e3180a641b..75dadf60d65 100644
--- a/arch/arm/src/stm32l4/stm32l4_serial.c
+++ b/arch/arm/src/stm32l4/stm32l4_serial.c
@@ -1962,15 +1962,14 @@ static int up_interrupt(int irq, void *context, void
*arg)
static int stm32l4serial_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT)
- struct inode *inode = filep->f_inode;
- struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS)
- struct stm32_serial_s *priv =
- (struct stm32_serial_s *)dev->priv;
-#endif
- int ret = OK;
+ struct inode *inode = filep->f_inode;
+ struct uart_dev_s *dev = inode->i_private;
+ struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
+ int ret = OK;
+
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
switch (cmd)
{
diff --git a/arch/arm/src/stm32l5/stm32l5_serial.c
b/arch/arm/src/stm32l5/stm32l5_serial.c
index 9e994dfb0c3..b4bf654fda8 100644
--- a/arch/arm/src/stm32l5/stm32l5_serial.c
+++ b/arch/arm/src/stm32l5/stm32l5_serial.c
@@ -1878,15 +1878,14 @@ static int stm32l5serial_interrupt(int irq, void
*context, void *arg)
static int stm32l5serial_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT)
- struct inode *inode = filep->f_inode;
- struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS)
- struct stm32_serial_s *priv =
- (struct stm32_serial_s *)dev->priv;
-#endif
- int ret = OK;
+ struct inode *inode = filep->f_inode;
+ struct uart_dev_s *dev = inode->i_private;
+ struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
+ int ret = OK;
+
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
switch (cmd)
{
diff --git a/arch/arm/src/stm32n6/stm32_serial.c
b/arch/arm/src/stm32n6/stm32_serial.c
index 7b053b9820f..df0dcd199b0 100644
--- a/arch/arm/src/stm32n6/stm32_serial.c
+++ b/arch/arm/src/stm32n6/stm32_serial.c
@@ -1064,15 +1064,14 @@ static int stm32serial_interrupt(int irq, void
*context, void *arg)
static int stm32serial_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT)
- struct inode *inode = filep->f_inode;
- struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS)
- struct stm32_serial_s *priv =
- (struct stm32_serial_s *)dev->priv;
-#endif
- int ret = OK;
+ struct inode *inode = filep->f_inode;
+ struct uart_dev_s *dev = inode->i_private;
+ struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
+ int ret = OK;
+
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
switch (cmd)
{
diff --git a/arch/arm/src/stm32u5/stm32_serial.c
b/arch/arm/src/stm32u5/stm32_serial.c
index 13d539fdb78..6abd9eb27d4 100644
--- a/arch/arm/src/stm32u5/stm32_serial.c
+++ b/arch/arm/src/stm32u5/stm32_serial.c
@@ -1892,15 +1892,14 @@ static int stm32serial_interrupt(int irq, void
*context, void *arg)
static int stm32serial_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT)
- struct inode *inode = filep->f_inode;
- struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS)
- struct stm32_serial_s *priv =
- (struct stm32_serial_s *)dev->priv;
-#endif
- int ret = OK;
+ struct inode *inode = filep->f_inode;
+ struct uart_dev_s *dev = inode->i_private;
+ struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
+ int ret = OK;
+
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
switch (cmd)
{
diff --git a/arch/arm/src/stm32wb/stm32wb_serial.c
b/arch/arm/src/stm32wb/stm32wb_serial.c
index a67006f7cf9..7f30bbc91bb 100644
--- a/arch/arm/src/stm32wb/stm32wb_serial.c
+++ b/arch/arm/src/stm32wb/stm32wb_serial.c
@@ -1581,14 +1581,14 @@ static int up_interrupt(int irq, void *context, void
*arg)
static int stm32_serial_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT)
- struct inode *inode = filep->f_inode;
- struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS)
- struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
-#endif
- int ret = OK;
+ struct inode *inode = filep->f_inode;
+ struct uart_dev_s *dev = inode->i_private;
+ struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
+ int ret = OK;
+
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
switch (cmd)
{
diff --git a/arch/arm/src/stm32wl5/stm32wl5_serial.c
b/arch/arm/src/stm32wl5/stm32wl5_serial.c
index 75705535333..31eda4fc60c 100644
--- a/arch/arm/src/stm32wl5/stm32wl5_serial.c
+++ b/arch/arm/src/stm32wl5/stm32wl5_serial.c
@@ -1643,15 +1643,14 @@ static int stm32wl5serial_interrupt(int irq, void
*context,
static int stm32wl5serial_ioctl(struct file *filep, int cmd,
unsigned long arg)
{
-#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT)
- struct inode *inode = filep->f_inode;
- struct uart_dev_s *dev = inode->i_private;
-#endif
-#if defined(CONFIG_SERIAL_TERMIOS)
- struct stm32_serial_s *priv =
- (struct stm32_serial_s *)dev->priv;
-#endif
- int ret = OK;
+ struct inode *inode = filep->f_inode;
+ struct uart_dev_s *dev = inode->i_private;
+ struct stm32_serial_s *priv = (struct stm32_serial_s *)dev->priv;
+ int ret = OK;
+
+ UNUSED(inode);
+ UNUSED(dev);
+ UNUSED(priv);
switch (cmd)
{
