The interrupt handler routines and helpers are casting the 'void *'
pointer to 'struct exynos_uart_port *' all over the place.
There is no need for that, we can do the casting once and keep passing
the 'struct exynos_uart_port *', simplifying the code and saving a few
lines of code.
No functional changes.
Signed-off-by: André Draszik <andre.draszik@linaro.org>
---
drivers/tty/serial/samsung_tty.c | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c
index 1c6d0ffe5649..971765aaeaca 100644
--- a/drivers/tty/serial/samsung_tty.c
+++ b/drivers/tty/serial/samsung_tty.c
@@ -707,9 +707,8 @@ static void enable_rx_pio(struct s3c24xx_uart_port *ourport)
static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport);
-static irqreturn_t s3c24xx_serial_rx_chars_dma(void *dev_id)
+static irqreturn_t s3c24xx_serial_rx_chars_dma(struct s3c24xx_uart_port *ourport)
{
- struct s3c24xx_uart_port *ourport = dev_id;
struct uart_port *port = &ourport->port;
struct s3c24xx_uart_dma *dma = ourport->dma;
struct tty_struct *tty = tty_port_tty_get(&ourport->port.state->port);
@@ -843,9 +842,8 @@ static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport)
tty_flip_buffer_push(&port->state->port);
}
-static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id)
+static irqreturn_t s3c24xx_serial_rx_chars_pio(struct s3c24xx_uart_port *ourport)
{
- struct s3c24xx_uart_port *ourport = dev_id;
struct uart_port *port = &ourport->port;
uart_port_lock(port);
@@ -855,13 +853,11 @@ static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id)
return IRQ_HANDLED;
}
-static irqreturn_t s3c24xx_serial_rx_irq(void *dev_id)
+static irqreturn_t s3c24xx_serial_rx_irq(struct s3c24xx_uart_port *ourport)
{
- struct s3c24xx_uart_port *ourport = dev_id;
-
if (ourport->dma && ourport->dma->rx_chan)
- return s3c24xx_serial_rx_chars_dma(dev_id);
- return s3c24xx_serial_rx_chars_pio(dev_id);
+ return s3c24xx_serial_rx_chars_dma(ourport);
+ return s3c24xx_serial_rx_chars_pio(ourport);
}
static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *ourport)
@@ -928,9 +924,8 @@ static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *ourport)
s3c24xx_serial_stop_tx(port);
}
-static irqreturn_t s3c24xx_serial_tx_irq(void *id)
+static irqreturn_t s3c24xx_serial_tx_irq(struct s3c24xx_uart_port *ourport)
{
- struct s3c24xx_uart_port *ourport = id;
struct uart_port *port = &ourport->port;
uart_port_lock(port);
@@ -950,11 +945,11 @@ static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id)
irqreturn_t ret = IRQ_HANDLED;
if (pend & S3C64XX_UINTM_RXD_MSK) {
- ret = s3c24xx_serial_rx_irq(id);
+ ret = s3c24xx_serial_rx_irq(ourport);
wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_RXD_MSK);
}
if (pend & S3C64XX_UINTM_TXD_MSK) {
- ret = s3c24xx_serial_tx_irq(id);
+ ret = s3c24xx_serial_tx_irq(ourport);
wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_TXD_MSK);
}
return ret;
@@ -971,11 +966,11 @@ static irqreturn_t apple_serial_handle_irq(int irq, void *id)
if (pend & (APPLE_S5L_UTRSTAT_RXTHRESH | APPLE_S5L_UTRSTAT_RXTO)) {
wr_regl(port, S3C2410_UTRSTAT,
APPLE_S5L_UTRSTAT_RXTHRESH | APPLE_S5L_UTRSTAT_RXTO);
- ret = s3c24xx_serial_rx_irq(id);
+ ret = s3c24xx_serial_rx_irq(ourport);
}
if (pend & APPLE_S5L_UTRSTAT_TXTHRESH) {
wr_regl(port, S3C2410_UTRSTAT, APPLE_S5L_UTRSTAT_TXTHRESH);
- ret = s3c24xx_serial_tx_irq(id);
+ ret = s3c24xx_serial_tx_irq(ourport);
}
return ret;
--
2.46.0.rc2.264.g509ed76dc8-goog
Hi André,
kernel test robot noticed the following build errors:
[auto build test ERROR on 1e391b34f6aa043c7afa40a2103163a0ef06d179]
url: https://github.com/intel-lab-lkp/linux/commits/Andr-Draszik/tty-serial-samsung_tty-drop-unused-argument-to-irq-handlers/20240806-234342
base: 1e391b34f6aa043c7afa40a2103163a0ef06d179
patch link: https://lore.kernel.org/r/20240806-samsung-tty-cleanup-v1-2-a68d3abf31fe%40linaro.org
patch subject: [PATCH 2/2] tty: serial: samsung_tty: cast the interrupt's void *id just once
config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20240809/202408091530.vvvqEiPv-lkp@intel.com/config)
compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240809/202408091530.vvvqEiPv-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202408091530.vvvqEiPv-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/tty/serial/samsung_tty.c:948:31: error: passing 'const struct s3c24xx_uart_port *' to parameter of type 'struct s3c24xx_uart_port *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
948 | ret = s3c24xx_serial_rx_irq(ourport);
| ^~~~~~~
drivers/tty/serial/samsung_tty.c:856:68: note: passing argument to parameter 'ourport' here
856 | static irqreturn_t s3c24xx_serial_rx_irq(struct s3c24xx_uart_port *ourport)
| ^
drivers/tty/serial/samsung_tty.c:952:31: error: passing 'const struct s3c24xx_uart_port *' to parameter of type 'struct s3c24xx_uart_port *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
952 | ret = s3c24xx_serial_tx_irq(ourport);
| ^~~~~~~
drivers/tty/serial/samsung_tty.c:927:68: note: passing argument to parameter 'ourport' here
927 | static irqreturn_t s3c24xx_serial_tx_irq(struct s3c24xx_uart_port *ourport)
| ^
drivers/tty/serial/samsung_tty.c:969:31: error: passing 'const struct s3c24xx_uart_port *' to parameter of type 'struct s3c24xx_uart_port *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
969 | ret = s3c24xx_serial_rx_irq(ourport);
| ^~~~~~~
drivers/tty/serial/samsung_tty.c:856:68: note: passing argument to parameter 'ourport' here
856 | static irqreturn_t s3c24xx_serial_rx_irq(struct s3c24xx_uart_port *ourport)
| ^
drivers/tty/serial/samsung_tty.c:973:31: error: passing 'const struct s3c24xx_uart_port *' to parameter of type 'struct s3c24xx_uart_port *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
973 | ret = s3c24xx_serial_tx_irq(ourport);
| ^~~~~~~
drivers/tty/serial/samsung_tty.c:927:68: note: passing argument to parameter 'ourport' here
927 | static irqreturn_t s3c24xx_serial_tx_irq(struct s3c24xx_uart_port *ourport)
| ^
4 errors generated.
vim +948 drivers/tty/serial/samsung_tty.c
938
939 /* interrupt handler for s3c64xx and later SoC's.*/
940 static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id)
941 {
942 const struct s3c24xx_uart_port *ourport = id;
943 const struct uart_port *port = &ourport->port;
944 u32 pend = rd_regl(port, S3C64XX_UINTP);
945 irqreturn_t ret = IRQ_HANDLED;
946
947 if (pend & S3C64XX_UINTM_RXD_MSK) {
> 948 ret = s3c24xx_serial_rx_irq(ourport);
949 wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_RXD_MSK);
950 }
951 if (pend & S3C64XX_UINTM_TXD_MSK) {
952 ret = s3c24xx_serial_tx_irq(ourport);
953 wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_TXD_MSK);
954 }
955 return ret;
956 }
957
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi André,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 1e391b34f6aa043c7afa40a2103163a0ef06d179]
url: https://github.com/intel-lab-lkp/linux/commits/Andr-Draszik/tty-serial-samsung_tty-drop-unused-argument-to-irq-handlers/20240806-234342
base: 1e391b34f6aa043c7afa40a2103163a0ef06d179
patch link: https://lore.kernel.org/r/20240806-samsung-tty-cleanup-v1-2-a68d3abf31fe%40linaro.org
patch subject: [PATCH 2/2] tty: serial: samsung_tty: cast the interrupt's void *id just once
config: i386-allmodconfig (https://download.01.org/0day-ci/archive/20240809/202408091405.QtjNlf8Z-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240809/202408091405.QtjNlf8Z-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202408091405.QtjNlf8Z-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/tty/serial/samsung_tty.c: In function 's3c64xx_serial_handle_irq':
>> drivers/tty/serial/samsung_tty.c:948:45: warning: passing argument 1 of 's3c24xx_serial_rx_irq' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
948 | ret = s3c24xx_serial_rx_irq(ourport);
| ^~~~~~~
drivers/tty/serial/samsung_tty.c:856:68: note: expected 'struct s3c24xx_uart_port *' but argument is of type 'const struct s3c24xx_uart_port *'
856 | static irqreturn_t s3c24xx_serial_rx_irq(struct s3c24xx_uart_port *ourport)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
>> drivers/tty/serial/samsung_tty.c:952:45: warning: passing argument 1 of 's3c24xx_serial_tx_irq' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
952 | ret = s3c24xx_serial_tx_irq(ourport);
| ^~~~~~~
drivers/tty/serial/samsung_tty.c:927:68: note: expected 'struct s3c24xx_uart_port *' but argument is of type 'const struct s3c24xx_uart_port *'
927 | static irqreturn_t s3c24xx_serial_tx_irq(struct s3c24xx_uart_port *ourport)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
drivers/tty/serial/samsung_tty.c: In function 'apple_serial_handle_irq':
drivers/tty/serial/samsung_tty.c:969:45: warning: passing argument 1 of 's3c24xx_serial_rx_irq' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
969 | ret = s3c24xx_serial_rx_irq(ourport);
| ^~~~~~~
drivers/tty/serial/samsung_tty.c:856:68: note: expected 'struct s3c24xx_uart_port *' but argument is of type 'const struct s3c24xx_uart_port *'
856 | static irqreturn_t s3c24xx_serial_rx_irq(struct s3c24xx_uart_port *ourport)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
drivers/tty/serial/samsung_tty.c:973:45: warning: passing argument 1 of 's3c24xx_serial_tx_irq' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
973 | ret = s3c24xx_serial_tx_irq(ourport);
| ^~~~~~~
drivers/tty/serial/samsung_tty.c:927:68: note: expected 'struct s3c24xx_uart_port *' but argument is of type 'const struct s3c24xx_uart_port *'
927 | static irqreturn_t s3c24xx_serial_tx_irq(struct s3c24xx_uart_port *ourport)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
vim +948 drivers/tty/serial/samsung_tty.c
938
939 /* interrupt handler for s3c64xx and later SoC's.*/
940 static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id)
941 {
942 const struct s3c24xx_uart_port *ourport = id;
943 const struct uart_port *port = &ourport->port;
944 u32 pend = rd_regl(port, S3C64XX_UINTP);
945 irqreturn_t ret = IRQ_HANDLED;
946
947 if (pend & S3C64XX_UINTM_RXD_MSK) {
> 948 ret = s3c24xx_serial_rx_irq(ourport);
949 wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_RXD_MSK);
950 }
951 if (pend & S3C64XX_UINTM_TXD_MSK) {
> 952 ret = s3c24xx_serial_tx_irq(ourport);
953 wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_TXD_MSK);
954 }
955 return ret;
956 }
957
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2026 Red Hat, Inc.