github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 13:06:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

tty: serial: meson: refactor objects definition for different devnames

Browse Source 
Macroses for name generation are not useful. They hide the real place
for object declaration. Instead, use direct names such as
'meson_uart_driver_*' and 'meson_serial_console_*' for all objects.

Additionally, rename 'MESON_SERIAL_CONSOLE_DEFINE()' to
'MESON_SERIAL_CONSOLE()', and 'MESON_UART_DRIVER_DEFINE()' to
'MESON_UART_DRIVER()' to simplify the code.

Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
Suggested-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20230728071522.17503-1-ddrokosov@sberdevices.ru
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dmitry Rokosov 2023-07-28 10:15:22 +03:00 committed by Greg Kroah-Hartman
parent 5f45b336fc
commit 17be181b06
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/tty/serial/meson_uart.c
View File

@ -76,13 +76,8 @@
#define AML_UART_POLL_USEC 5
#define AML_UART_TIMEOUT_USEC 10000
#define MESON_UART_DRIVER(_devname) meson_uart_driver_##_devname
#define MESON_UART_DRIVER_DECLARE(_devname) \
static struct uart_driver MESON_UART_DRIVER(_devname)
MESON_UART_DRIVER_DECLARE(ttyAML);
MESON_UART_DRIVER_DECLARE(ttyS);
static struct uart_driver meson_uart_driver_ttyAML;
static struct uart_driver meson_uart_driver_ttyS;
static struct uart_port *meson_ports[AML_UART_PORT_NUM];
@ -617,21 +612,19 @@ static int meson_serial_console_setup(struct console *co, char *options)
return uart_set_options(port, co, baud, parity, bits, flow);
}
#define MESON_SERIAL_CONSOLE(_devname) meson_serial_console_##_devname
#define MESON_SERIAL_CONSOLE_DEFINE(_devname) \
static struct console MESON_SERIAL_CONSOLE(_devname) = { \
#define MESON_SERIAL_CONSOLE(_devname) \
static struct console meson_serial_console_##_devname = { \
.name = __stringify(_devname), \
.write = meson_serial_console_write, \
.device = uart_console_device, \
.setup = meson_serial_console_setup, \
.flags = CON_PRINTBUFFER, \
.index = -1, \
.data = &MESON_UART_DRIVER(_devname), \
.data = &meson_uart_driver_##_devname, \
}
MESON_SERIAL_CONSOLE_DEFINE(ttyAML);
MESON_SERIAL_CONSOLE_DEFINE(ttyS);
MESON_SERIAL_CONSOLE(ttyAML);
MESON_SERIAL_CONSOLE(ttyS);
static void meson_serial_early_console_write(struct console *co,
const char *s,
@ -656,13 +649,13 @@ meson_serial_early_console_setup(struct earlycon_device *device, const char *opt
OF_EARLYCON_DECLARE(meson, "amlogic,meson-ao-uart",
meson_serial_early_console_setup);
#define MESON_SERIAL_CONSOLE_PTR(_devname) (&MESON_SERIAL_CONSOLE(_devname))
#define MESON_SERIAL_CONSOLE_PTR(_devname) (&meson_serial_console_##_devname)
#else
#define MESON_SERIAL_CONSOLE_PTR(_devname) (NULL)
#define MESON_SERIAL_CONSOLE_PTR(_devname) (NULL)
#endif
#define MESON_UART_DRIVER_DEFINE(_devname) \
static struct uart_driver MESON_UART_DRIVER(_devname) = { \
#define MESON_UART_DRIVER(_devname) \
static struct uart_driver meson_uart_driver_##_devname = { \
.owner = THIS_MODULE, \
.driver_name = "meson_uart", \
.dev_name = __stringify(_devname), \
@ -670,8 +663,8 @@ OF_EARLYCON_DECLARE(meson, "amlogic,meson-ao-uart",
.cons = MESON_SERIAL_CONSOLE_PTR(_devname), \
}
MESON_UART_DRIVER_DEFINE(ttyAML);
MESON_UART_DRIVER_DEFINE(ttyS);
MESON_UART_DRIVER(ttyAML);
MESON_UART_DRIVER(ttyS);
static int meson_uart_probe_clocks(struct platform_device *pdev,
struct uart_port *port)
@ -700,7 +693,7 @@ static int meson_uart_probe_clocks(struct platform_device *pdev,
static struct uart_driver *meson_uart_current(const struct meson_uart_data *pd)
{
return (pd && pd->uart_driver) ?
pd->uart_driver : &MESON_UART_DRIVER(ttyAML);
pd->uart_driver : &meson_uart_driver_ttyAML;
}
static int meson_uart_probe(struct platform_device *pdev)
@ -819,12 +812,12 @@ static struct meson_uart_data meson_g12a_uart_data = {
};
static struct meson_uart_data meson_a1_uart_data = {
.uart_driver = &MESON_UART_DRIVER(ttyS),
.uart_driver = &meson_uart_driver_ttyS,
.has_xtal_div2 = false,
};
static struct meson_uart_data meson_s4_uart_data = {
.uart_driver = &MESON_UART_DRIVER(ttyS),
.uart_driver = &meson_uart_driver_ttyS,
.has_xtal_div2 = true,
};