Commit ff3c62ed authored by André Draszik's avatar André Draszik Committed by Greg Kroah-Hartman

tty: serial: samsung_tty: cast the interrupt's void *id just once

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.
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@linaro.org>
Signed-off-by: default avatarAndré Draszik <andre.draszik@linaro.org>
Reviewed-by: default avatarJiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20240808-samsung-tty-cleanup-v3-2-494412f49f4b@linaro.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24179de0
...@@ -707,9 +707,8 @@ static void enable_rx_pio(struct s3c24xx_uart_port *ourport) ...@@ -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 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 uart_port *port = &ourport->port;
struct s3c24xx_uart_dma *dma = ourport->dma; struct s3c24xx_uart_dma *dma = ourport->dma;
struct tty_struct *tty = tty_port_tty_get(&ourport->port.state->port); 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) ...@@ -843,9 +842,8 @@ static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport)
tty_flip_buffer_push(&port->state->port); 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; struct uart_port *port = &ourport->port;
uart_port_lock(port); uart_port_lock(port);
...@@ -855,13 +853,11 @@ static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id) ...@@ -855,13 +853,11 @@ static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id)
return IRQ_HANDLED; 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) if (ourport->dma && ourport->dma->rx_chan)
return s3c24xx_serial_rx_chars_dma(dev_id); return s3c24xx_serial_rx_chars_dma(ourport);
return s3c24xx_serial_rx_chars_pio(dev_id); return s3c24xx_serial_rx_chars_pio(ourport);
} }
static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *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) ...@@ -928,9 +924,8 @@ static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *ourport)
s3c24xx_serial_stop_tx(port); 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; struct uart_port *port = &ourport->port;
uart_port_lock(port); uart_port_lock(port);
...@@ -944,17 +939,17 @@ static irqreturn_t s3c24xx_serial_tx_irq(void *id) ...@@ -944,17 +939,17 @@ static irqreturn_t s3c24xx_serial_tx_irq(void *id)
/* interrupt handler for s3c64xx and later SoC's.*/ /* interrupt handler for s3c64xx and later SoC's.*/
static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id) static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id)
{ {
const struct s3c24xx_uart_port *ourport = id; struct s3c24xx_uart_port *ourport = id;
const struct uart_port *port = &ourport->port; const struct uart_port *port = &ourport->port;
u32 pend = rd_regl(port, S3C64XX_UINTP); u32 pend = rd_regl(port, S3C64XX_UINTP);
irqreturn_t ret = IRQ_HANDLED; irqreturn_t ret = IRQ_HANDLED;
if (pend & S3C64XX_UINTM_RXD_MSK) { 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); wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_RXD_MSK);
} }
if (pend & S3C64XX_UINTM_TXD_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); wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_TXD_MSK);
} }
return ret; return ret;
...@@ -963,7 +958,7 @@ static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id) ...@@ -963,7 +958,7 @@ static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id)
/* interrupt handler for Apple SoC's.*/ /* interrupt handler for Apple SoC's.*/
static irqreturn_t apple_serial_handle_irq(int irq, void *id) static irqreturn_t apple_serial_handle_irq(int irq, void *id)
{ {
const struct s3c24xx_uart_port *ourport = id; struct s3c24xx_uart_port *ourport = id;
const struct uart_port *port = &ourport->port; const struct uart_port *port = &ourport->port;
u32 pend = rd_regl(port, S3C2410_UTRSTAT); u32 pend = rd_regl(port, S3C2410_UTRSTAT);
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
...@@ -971,11 +966,11 @@ static irqreturn_t apple_serial_handle_irq(int irq, void *id) ...@@ -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)) { if (pend & (APPLE_S5L_UTRSTAT_RXTHRESH | APPLE_S5L_UTRSTAT_RXTO)) {
wr_regl(port, S3C2410_UTRSTAT, wr_regl(port, S3C2410_UTRSTAT,
APPLE_S5L_UTRSTAT_RXTHRESH | APPLE_S5L_UTRSTAT_RXTO); 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) { if (pend & APPLE_S5L_UTRSTAT_TXTHRESH) {
wr_regl(port, S3C2410_UTRSTAT, 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; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment