Commit c202beee authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman

staging: sm750fb: replace lynx_crtc methods with function calls

The methods in lynx_crtc always use the same implementation and there is
no point to use redirection rather than direct function call.
Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9b2941e2
...@@ -304,7 +304,7 @@ static int lynxfb_ops_pan_display(struct fb_var_screeninfo *var, ...@@ -304,7 +304,7 @@ static int lynxfb_ops_pan_display(struct fb_var_screeninfo *var,
par = info->par; par = info->par;
crtc = &par->crtc; crtc = &par->crtc;
return crtc->proc_panDisplay(crtc, var, info); return hw_sm750_pan_display(crtc, var, info);
} }
static int lynxfb_ops_set_par(struct fb_info *info) static int lynxfb_ops_set_par(struct fb_info *info)
...@@ -384,7 +384,7 @@ static int lynxfb_ops_set_par(struct fb_info *info) ...@@ -384,7 +384,7 @@ static int lynxfb_ops_set_par(struct fb_info *info)
pr_err("pixel bpp format not satisfied\n."); pr_err("pixel bpp format not satisfied\n.");
return ret; return ret;
} }
ret = crtc->proc_setMode(crtc, var, fix); ret = hw_sm750_crtc_setMode(crtc, var, fix);
if (!ret) if (!ret)
ret = output->proc_setMode(output, var, fix); ret = output->proc_setMode(output, var, fix);
return ret; return ret;
...@@ -581,7 +581,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var, ...@@ -581,7 +581,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var,
return -ENOMEM; return -ENOMEM;
} }
return crtc->proc_checkMode(crtc, var); return hw_sm750_crtc_checkMode(crtc, var);
} }
static int lynxfb_ops_setcolreg(unsigned regno, static int lynxfb_ops_setcolreg(unsigned regno,
...@@ -614,7 +614,7 @@ static int lynxfb_ops_setcolreg(unsigned regno, ...@@ -614,7 +614,7 @@ static int lynxfb_ops_setcolreg(unsigned regno,
red >>= 8; red >>= 8;
green >>= 8; green >>= 8;
blue >>= 8; blue >>= 8;
ret = crtc->proc_setColReg(crtc, regno, red, green, blue); ret = hw_sm750_setColReg(crtc, regno, red, green, blue);
goto exit; goto exit;
} }
...@@ -669,10 +669,6 @@ static int sm750fb_set_drv(struct lynxfb_par *par) ...@@ -669,10 +669,6 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
/* setup crtc and output member */ /* setup crtc and output member */
spec_share->hwCursor = g_hwcursor; spec_share->hwCursor = g_hwcursor;
crtc->proc_setMode = hw_sm750_crtc_setMode;
crtc->proc_checkMode = hw_sm750_crtc_checkMode;
crtc->proc_setColReg = hw_sm750_setColReg;
crtc->proc_panDisplay = hw_sm750_pan_display;
crtc->line_pad = 16; crtc->line_pad = 16;
crtc->xpanstep = 8; crtc->xpanstep = 8;
crtc->ypanstep = 1; crtc->ypanstep = 1;
......
...@@ -104,16 +104,6 @@ struct lynxfb_crtc { ...@@ -104,16 +104,6 @@ struct lynxfb_crtc {
void *priv; void *priv;
int (*proc_setMode)(struct lynxfb_crtc*,
struct fb_var_screeninfo*,
struct fb_fix_screeninfo*);
int (*proc_checkMode)(struct lynxfb_crtc*, struct fb_var_screeninfo*);
int (*proc_setColReg)(struct lynxfb_crtc*, ushort, ushort, ushort, ushort);
/* pan display */
int (*proc_panDisplay)(struct lynxfb_crtc *,
const struct fb_var_screeninfo *,
const struct fb_info *);
/* cursor information */ /* cursor information */
struct lynx_cursor cursor; struct lynx_cursor cursor;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment