diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2022-05-03 09:31:17 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-05 23:39:18 +0300 |
| commit | 343f23cfc22b1d1577289db694f6896d1ac26594 (patch) | |
| tree | 48b2494c53db9c23c56748b47f728306cc7fe0b5 /drivers/tty/serial/pic32_uart.c | |
| parent | e8616bd0e9f24a9265fe5db1e7963185514b445a (diff) | |
| download | linux-343f23cfc22b1d1577289db694f6896d1ac26594.tar.xz | |
serial: pic32: remove pic32_get_port() macro
It's just &sport->port. First, sport was not in parenthesis, so macro
expansion could be an issue. Second, it's so simple, that we can expand
the macro and make the code really straightforward.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220503063122.20957-7-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/pic32_uart.c')
| -rw-r--r-- | drivers/tty/serial/pic32_uart.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/tty/serial/pic32_uart.c b/drivers/tty/serial/pic32_uart.c index a6d548d5833d..32a86b12f203 100644 --- a/drivers/tty/serial/pic32_uart.c +++ b/drivers/tty/serial/pic32_uart.c @@ -73,21 +73,16 @@ struct pic32_sport { struct device *dev; }; #define to_pic32_sport(c) container_of(c, struct pic32_sport, port) -#define pic32_get_port(sport) (&sport->port) static inline void pic32_uart_writel(struct pic32_sport *sport, u32 reg, u32 val) { - struct uart_port *port = pic32_get_port(sport); - - __raw_writel(val, port->membase + reg); + __raw_writel(val, sport->port.membase + reg); } static inline u32 pic32_uart_readl(struct pic32_sport *sport, u32 reg) { - struct uart_port *port = pic32_get_port(sport); - - return __raw_readl(port->membase + reg); + return __raw_readl(sport->port.membase + reg); } /* pic32 uart mode register bits */ @@ -789,10 +784,9 @@ static void pic32_console_write(struct console *co, const char *s, unsigned int count) { struct pic32_sport *sport = pic32_sports[co->index]; - struct uart_port *port = pic32_get_port(sport); /* call uart helper to deal with \r\n */ - uart_console_write(port, s, count, pic32_console_putchar); + uart_console_write(&sport->port, s, count, pic32_console_putchar); } /* console core request to setup given console, find matching uart @@ -801,7 +795,6 @@ static void pic32_console_write(struct console *co, const char *s, static int pic32_console_setup(struct console *co, char *options) { struct pic32_sport *sport; - struct uart_port *port = NULL; int baud = 115200; int bits = 8; int parity = 'n'; @@ -814,7 +807,6 @@ static int pic32_console_setup(struct console *co, char *options) sport = pic32_sports[co->index]; if (!sport) return -ENODEV; - port = pic32_get_port(sport); ret = clk_prepare_enable(sport->clk); if (ret) @@ -823,7 +815,7 @@ static int pic32_console_setup(struct console *co, char *options) if (options) uart_parse_options(options, &baud, &parity, &bits, &flow); - return uart_set_options(port, co, baud, parity, bits, flow); + return uart_set_options(&sport->port, co, baud, parity, bits, flow); } static struct uart_driver pic32_uart_driver; |