aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/console/fbcon.c
diff options
context:
space:
mode:
authorWang YanQing <udknight@gmail.com>2013-05-09 02:13:30 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-20 12:27:58 -0700
commite57f35d45f37a380ebf4006b560b68f3eb6af3d7 (patch)
treed30ab5937976548421fa00d4a03f3b77895f6cd2 /drivers/video/console/fbcon.c
parenttty: Remove TTY_HW_COOK_IN/OUT (diff)
downloadlinux-dev-e57f35d45f37a380ebf4006b560b68f3eb6af3d7.tar.xz
linux-dev-e57f35d45f37a380ebf4006b560b68f3eb6af3d7.zip
fbcon: convert last fbcon_takeover call to do_fbcon_takeover
After commit 054430e773c9a1e26f38e30156eff02dedfffc17 (fbcon: fix locking harder), there is only one place use do_fbcon_takeover now, this patch convert it to do_fbcon_takeover too, then we can delete fbcon_takeover whos function can be achieved with do_fbcon_takeover easily to reduce code size and duplication. Signed-off-by: Wang YanQing <udknight@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/console/fbcon.c')
-rw-r--r--drivers/video/console/fbcon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index a92783e480e6..84121da38474 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -3543,8 +3543,9 @@ static void fbcon_start(void)
}
}
+ do_fbcon_takeover(0);
console_unlock();
- fbcon_takeover(0);
+
}
}