shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

fiq_debugger: stop using alloc_tty_driver

Browse Source 
According to upstream commit 39b7b42be4 ("tty: stop using alloc_tty_driver").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I1f60a2066a2649c736e333a11161bfb49bef8ccb
This commit is contained in:
Tao Huang
2022-11-08 16:40:04 +08:00
parent bda58d2941
commit 4c1ad45c30
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/android/fiq_debugger/fiq_debugger.c
View File

@@ -131,7 +131,7 @@ struct fiq_debugger_state {
};
#ifdef CONFIG_FIQ_DEBUGGER_CONSOLE
struct tty_driver *fiq_tty_driver;
static struct tty_driver *fiq_tty_driver;
#endif
#ifdef CONFIG_FIQ_DEBUGGER_NO_SLEEP
@@ -1315,6 +1315,7 @@ static int fiq_debugger_tty_init(void)
{
int ret;
struct fiq_debugger_state **states = NULL;
struct tty_driver *drv;
states = kzalloc(sizeof(*states) * MAX_FIQ_DEBUGGER_PORTS, GFP_KERNEL);
if (!states) {
@@ -1322,12 +1323,13 @@ static int fiq_debugger_tty_init(void)
return -ENOMEM;
}
fiq_tty_driver = alloc_tty_driver(MAX_FIQ_DEBUGGER_PORTS);
if (!fiq_tty_driver) {
drv = tty_alloc_driver(MAX_FIQ_DEBUGGER_PORTS, TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV);
if (IS_ERR(drv)) {
pr_err("Failed to allocate fiq debugger tty\n");
ret = -ENOMEM;
goto err_free_state;
}
fiq_tty_driver = drv;
fiq_tty_driver->owner = THIS_MODULE;
fiq_tty_driver->driver_name = "fiq-debugger";
@@ -1335,8 +1337,6 @@ static int fiq_debugger_tty_init(void)
fiq_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
fiq_tty_driver->subtype = SERIAL_TYPE_NORMAL;
fiq_tty_driver->init_termios = tty_std_termios;
fiq_tty_driver->flags = TTY_DRIVER_REAL_RAW |
TTY_DRIVER_DYNAMIC_DEV;
fiq_tty_driver->driver_state = states;
fiq_tty_driver->init_termios.c_cflag =