Commit 92fc0023 authored by Erwan Le Ray's avatar Erwan Le Ray Committed by Greg Kroah-Hartman

serial: stm32: fix code cleaning warnings and checks

Fixes checkpatch --strict warnings and checks:
- checkpatch --strict "Unnecessary parentheses"
- checkpatch --strict "Blank lines aren't necessary before a close brace
- checkpatch --strict "Alignment should match open parenthesis"
- checkpatch --strict "Please don't use multiple blank lines"
- checkpatch --strict "Comparison to NULL could be written ..."
- visual check code ordering warning
Signed-off-by: default avatarErwan Le Ray <erwan.leray@foss.st.com>
Link: https://lore.kernel.org/r/20210106162203.28854-3-erwan.leray@foss.st.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7997f7f
...@@ -176,8 +176,7 @@ static int stm32_pending_rx(struct uart_port *port, u32 *sr, int *last_res, ...@@ -176,8 +176,7 @@ static int stm32_pending_rx(struct uart_port *port, u32 *sr, int *last_res,
status = dmaengine_tx_status(stm32_port->rx_ch, status = dmaengine_tx_status(stm32_port->rx_ch,
stm32_port->rx_ch->cookie, stm32_port->rx_ch->cookie,
&state); &state);
if ((status == DMA_IN_PROGRESS) && if (status == DMA_IN_PROGRESS && (*last_res != state.residue))
(*last_res != state.residue))
return 1; return 1;
else else
return 0; return 0;
...@@ -464,7 +463,7 @@ static irqreturn_t stm32_interrupt(int irq, void *ptr) ...@@ -464,7 +463,7 @@ static irqreturn_t stm32_interrupt(int irq, void *ptr)
writel_relaxed(USART_ICR_RTOCF, writel_relaxed(USART_ICR_RTOCF,
port->membase + ofs->icr); port->membase + ofs->icr);
if ((sr & USART_SR_WUF) && (ofs->icr != UNDEF_REG)) if ((sr & USART_SR_WUF) && ofs->icr != UNDEF_REG)
writel_relaxed(USART_ICR_WUCF, writel_relaxed(USART_ICR_WUCF,
port->membase + ofs->icr); port->membase + ofs->icr);
...@@ -620,7 +619,6 @@ static void stm32_stop_rx(struct uart_port *port) ...@@ -620,7 +619,6 @@ static void stm32_stop_rx(struct uart_port *port)
stm32_clr_bits(port, ofs->cr1, stm32_port->cr1_irq); stm32_clr_bits(port, ofs->cr1, stm32_port->cr1_irq);
if (stm32_port->cr3_irq) if (stm32_port->cr3_irq)
stm32_clr_bits(port, ofs->cr3, stm32_port->cr3_irq); stm32_clr_bits(port, ofs->cr3, stm32_port->cr3_irq);
} }
/* Handle breaks - ignored by us */ /* Handle breaks - ignored by us */
...@@ -973,18 +971,17 @@ static int stm32_init_port(struct stm32_port *stm32port, ...@@ -973,18 +971,17 @@ static int stm32_init_port(struct stm32_port *stm32port,
struct resource *res; struct resource *res;
int ret; int ret;
ret = platform_get_irq(pdev, 0);
if (ret <= 0)
return ret ? : -ENODEV;
port->iotype = UPIO_MEM; port->iotype = UPIO_MEM;
port->flags = UPF_BOOT_AUTOCONF; port->flags = UPF_BOOT_AUTOCONF;
port->ops = &stm32_uart_ops; port->ops = &stm32_uart_ops;
port->dev = &pdev->dev; port->dev = &pdev->dev;
port->fifosize = stm32port->info->cfg.fifosize; port->fifosize = stm32port->info->cfg.fifosize;
port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_STM32_CONSOLE); port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_STM32_CONSOLE);
ret = platform_get_irq(pdev, 0);
if (ret <= 0)
return ret ? : -ENODEV;
port->irq = ret; port->irq = ret;
port->rs485_config = stm32_config_rs485; port->rs485_config = stm32_config_rs485;
ret = stm32_init_rs485(port, pdev); ret = stm32_init_rs485(port, pdev);
...@@ -1322,7 +1319,6 @@ static int stm32_serial_remove(struct platform_device *pdev) ...@@ -1322,7 +1319,6 @@ static int stm32_serial_remove(struct platform_device *pdev)
return err; return err;
} }
#ifdef CONFIG_SERIAL_STM32_CONSOLE #ifdef CONFIG_SERIAL_STM32_CONSOLE
static void stm32_console_putchar(struct uart_port *port, int ch) static void stm32_console_putchar(struct uart_port *port, int ch)
{ {
...@@ -1335,7 +1331,8 @@ static void stm32_console_putchar(struct uart_port *port, int ch) ...@@ -1335,7 +1331,8 @@ static void stm32_console_putchar(struct uart_port *port, int ch)
writel_relaxed(ch, port->membase + ofs->tdr); writel_relaxed(ch, port->membase + ofs->tdr);
} }
static void stm32_console_write(struct console *co, const char *s, unsigned cnt) static void stm32_console_write(struct console *co, const char *s,
unsigned int cnt)
{ {
struct uart_port *port = &stm32_ports[co->index].port; struct uart_port *port = &stm32_ports[co->index].port;
struct stm32_port *stm32_port = to_stm32_port(port); struct stm32_port *stm32_port = to_stm32_port(port);
...@@ -1388,7 +1385,7 @@ static int stm32_console_setup(struct console *co, char *options) ...@@ -1388,7 +1385,7 @@ static int stm32_console_setup(struct console *co, char *options)
* this to be called during the uart port registration when the * this to be called during the uart port registration when the
* driver gets probed and the port should be mapped at that point. * driver gets probed and the port should be mapped at that point.
*/ */
if (stm32port->port.mapbase == 0 || stm32port->port.membase == NULL) if (stm32port->port.mapbase == 0 || !stm32port->port.membase)
return -ENXIO; return -ENXIO;
if (options) if (options)
......
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