TTY:vt: convert remain take_over_console's users to do_take_over_console
Impact:
1:convert all remain take_over_console to do_take_over_console
2:update take_over_console to do_take_over_console in comment
Commit dc9641895a
("vt: delete unneeded functions
register_con_driver|take_over_console") delete take_over_console,
but forget to convert remain take_over_console's users to new API
do_take_over_console, this patch fix it.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Wang YanQing <udknight@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

کامیت شده توسط
Greg Kroah-Hartman

والد
4898e640ca
کامیت
155957f56c
@@ -297,7 +297,7 @@ static void newport_exit(void)
|
||||
newport_set_def_font(i, NULL);
|
||||
}
|
||||
|
||||
/* Can't be __init, take_over_console may call it later */
|
||||
/* Can't be __init, do_take_over_console may call it later */
|
||||
static const char *newport_startup(void)
|
||||
{
|
||||
int i;
|
||||
@@ -746,6 +746,7 @@ static int newport_probe(struct gio_device *dev,
|
||||
const struct gio_device_id *id)
|
||||
{
|
||||
unsigned long newport_addr;
|
||||
int err;
|
||||
|
||||
if (!dev->resource.start)
|
||||
return -EINVAL;
|
||||
@@ -759,8 +760,10 @@ static int newport_probe(struct gio_device *dev,
|
||||
|
||||
npregs = (struct newport_regs *)/* ioremap cannot fail */
|
||||
ioremap(newport_addr, sizeof(struct newport_regs));
|
||||
|
||||
return take_over_console(&newport_con, 0, MAX_NR_CONSOLES - 1, 1);
|
||||
console_lock();
|
||||
err = do_take_over_console(&newport_con, 0, MAX_NR_CONSOLES - 1, 1);
|
||||
console_unlock();
|
||||
return err;
|
||||
}
|
||||
|
||||
static void newport_remove(struct gio_device *dev)
|
||||
|
مرجع در شماره جدید
Block a user