From: Wang YanQing <udknight@gmail.com>
Date: Wed, 8 May 2013 18:13:30 +0000 (+0800)
Subject: fbcon: convert last fbcon_takeover call to do_fbcon_takeover
X-Git-Tag: firefly_0821_release~176^2~5846^2~47
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e57f35d45f37a380ebf4006b560b68f3eb6af3d7;p=firefly-linux-kernel-4.4.55.git

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>
---

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);
+
 	}
 }