fbcon: Introduce get_{fg,bg}_color()

Make the code more legible by adding get_{fg,bg}_color()
which hide the obscure 'is_fg' parameter of get_color()
from the caller.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index 0e06066aed9558329e41df11d45ae2b63e9a8c80..bc3cde4138bd442b43516a73697d89128078f31b 100644 (file)
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -363,6 +363,16 @@ static int get_color(struct vc_data *vc, struct fb_info *info,
        return color;
 }
 
+static int get_fg_color(struct vc_data *vc, struct fb_info *info, u16 c)
+{
+       return get_color(vc, info, c, 1);
+}
+
+static int get_bg_color(struct vc_data *vc, struct fb_info *info, u16 c)
+{
+       return get_color(vc, info, c, 0);
+}
+
 static void fb_flashcursor(struct work_struct *work)
 {
        struct fbcon_ops *ops = container_of(work, struct fbcon_ops, cursor_work.work);
@@ -394,8 +404,9 @@ static void fb_flashcursor(struct work_struct *work)
 
        c = scr_readw((u16 *) vc->vc_pos);
        enable = ops->cursor_flash && !ops->cursor_state.enable;
-       ops->cursor(vc, info, enable, get_color(vc, info, c, 1),
-                   get_color(vc, info, c, 0));
+       ops->cursor(vc, info, enable,
+                   get_fg_color(vc, info, c),
+                   get_bg_color(vc, info, c));
        console_unlock();
 
        queue_delayed_work(system_power_efficient_wq, &ops->cursor_work,
@@ -1312,8 +1323,8 @@ static void fbcon_putcs(struct vc_data *vc, const u16 *s, unsigned int count,
 
        if (fbcon_is_active(vc, info))
                ops->putcs(vc, info, s, count, real_y(p, ypos), xpos,
-                          get_color(vc, info, scr_readw(s), 1),
-                          get_color(vc, info, scr_readw(s), 0));
+                          get_fg_color(vc, info, scr_readw(s)),
+                          get_bg_color(vc, info, scr_readw(s)));
 }
 
 static void fbcon_clear_margins(struct vc_data *vc, int bottom_only)
@@ -1346,8 +1357,9 @@ static void fbcon_cursor(struct vc_data *vc, bool enable)
        if (!ops->cursor)
                return;
 
-       ops->cursor(vc, info, enable, get_color(vc, info, c, 1),
-                   get_color(vc, info, c, 0));
+       ops->cursor(vc, info, enable,
+                   get_fg_color(vc, info, c),
+                   get_bg_color(vc, info, c));
 }
 
 static int scrollback_phys_max = 0;