diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2023-08-03 15:56:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-04 15:08:29 +0200 |
| commit | c2d6c1b4f0349a5d93ebbd8d5311fbbaf1fa54dd (patch) | |
| tree | a4baff9b5c1a34a9c91419d327020ecdc52c7764 | |
| parent | 42ac6998ec878f640768f03ec2d753f32f51d6a4 (diff) | |
| download | linux-stable-c2d6c1b4f0349a5d93ebbd8d5311fbbaf1fa54dd.tar.gz linux-stable-c2d6c1b4f0349a5d93ebbd8d5311fbbaf1fa54dd.tar.bz2 linux-stable-c2d6c1b4f0349a5d93ebbd8d5311fbbaf1fa54dd.zip | |
serial: cpm_uart: Use get_baudrate() instead of uart_baudrate()
uart_baudrate() is just a trivial wrapper to get_baudrate().
Use get_baudrate() directly and remove assignment in if condition.
And also remove uart_clock() which is not used since
commit 0b2a2e5b7747 ("cpm_uart: Remove !CONFIG_PPC_CPM_NEW_BINDING
code")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/4d497386f576a3df768e44a04f9bb512e424c311.1691068700.git.christophe.leroy@csgroup.eu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/powerpc/include/asm/fs_pd.h | 10 | ||||
| -rw-r--r-- | drivers/tty/serial/cpm_uart/cpm_uart_core.c | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/arch/powerpc/include/asm/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h index 8def56ec05c6..7b61b80f212d 100644 --- a/arch/powerpc/include/asm/fs_pd.h +++ b/arch/powerpc/include/asm/fs_pd.h @@ -36,14 +36,4 @@ extern immap_t __iomem *mpc8xx_immr; #define immr_unmap(addr) do {} while (0) #endif -static inline int uart_baudrate(void) -{ - return get_baudrate(); -} - -static inline int uart_clock(void) -{ - return ppc_proc_freq; -} - #endif diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c index c5a896f79d80..36bac4390c13 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c @@ -32,10 +32,11 @@ #include <linux/gpio/consumer.h> #include <linux/clk.h> +#include <sysdev/fsl_soc.h> + #include <asm/io.h> #include <asm/irq.h> #include <asm/delay.h> -#include <asm/fs_pd.h> #include <asm/udbg.h> #include <linux/serial_core.h> @@ -1311,7 +1312,8 @@ static int __init cpm_uart_console_setup(struct console *co, char *options) if (options) { uart_parse_options(options, &baud, &parity, &bits, &flow); } else { - if ((baud = uart_baudrate()) == -1) + baud = get_baudrate(); + if (baud == -1) baud = 9600; } |