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

staging: sm750fb: remove proc_checkMode method from lynxfb_output

The proc_checkMode of lynxfb_output is set to function that always
returns 0. Calling that function and checking for its return value is
meaningless.
Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 104f456c
...@@ -588,10 +588,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var, ...@@ -588,10 +588,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var,
return -ENOMEM; return -ENOMEM;
} }
ret = output->proc_checkMode(output, var); return crtc->proc_checkMode(crtc, var);
if (!ret)
ret = crtc->proc_checkMode(crtc, var);
return ret;
} }
static int lynxfb_ops_setcolreg(unsigned regno, static int lynxfb_ops_setcolreg(unsigned regno,
...@@ -690,7 +687,6 @@ static int sm750fb_set_drv(struct lynxfb_par *par) ...@@ -690,7 +687,6 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
crtc->ywrapstep = 0; crtc->ywrapstep = 0;
output->proc_setMode = hw_sm750_output_setMode; output->proc_setMode = hw_sm750_output_setMode;
output->proc_checkMode = hw_sm750_output_checkMode;
output->proc_setBLANK = (share->revid == SM750LE_REVISION_ID) ? output->proc_setBLANK = (share->revid == SM750LE_REVISION_ID) ?
hw_sm750le_setBLANK : hw_sm750_setBLANK; hw_sm750le_setBLANK : hw_sm750_setBLANK;
......
...@@ -143,7 +143,6 @@ struct lynxfb_output { ...@@ -143,7 +143,6 @@ struct lynxfb_output {
struct fb_var_screeninfo*, struct fb_var_screeninfo*,
struct fb_fix_screeninfo*); struct fb_fix_screeninfo*);
int (*proc_checkMode)(struct lynxfb_output*, struct fb_var_screeninfo*);
int (*proc_setBLANK)(struct lynxfb_output*, int); int (*proc_setBLANK)(struct lynxfb_output*, int);
void (*clear)(struct lynxfb_output *); void (*clear)(struct lynxfb_output *);
}; };
......
...@@ -190,15 +190,6 @@ resource_size_t hw_sm750_getVMSize(struct lynx_share *share) ...@@ -190,15 +190,6 @@ resource_size_t hw_sm750_getVMSize(struct lynx_share *share)
return ret; return ret;
} }
int hw_sm750_output_checkMode(struct lynxfb_output *output, struct fb_var_screeninfo *var)
{
return 0;
}
int hw_sm750_output_setMode(struct lynxfb_output *output, int hw_sm750_output_setMode(struct lynxfb_output *output,
struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix) struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix)
{ {
......
...@@ -85,7 +85,6 @@ int hw_sm750_deWait(void); ...@@ -85,7 +85,6 @@ int hw_sm750_deWait(void);
int hw_sm750le_deWait(void); int hw_sm750le_deWait(void);
resource_size_t hw_sm750_getVMSize(struct lynx_share *); resource_size_t hw_sm750_getVMSize(struct lynx_share *);
int hw_sm750_output_checkMode(struct lynxfb_output*, struct fb_var_screeninfo*);
int hw_sm750_output_setMode(struct lynxfb_output*, struct fb_var_screeninfo*, struct fb_fix_screeninfo*); int hw_sm750_output_setMode(struct lynxfb_output*, struct fb_var_screeninfo*, struct fb_fix_screeninfo*);
int hw_sm750_crtc_checkMode(struct lynxfb_crtc*, struct fb_var_screeninfo*); int hw_sm750_crtc_checkMode(struct lynxfb_crtc*, struct fb_var_screeninfo*);
int hw_sm750_crtc_setMode(struct lynxfb_crtc*, struct fb_var_screeninfo*, struct fb_fix_screeninfo*); int hw_sm750_crtc_setMode(struct lynxfb_crtc*, struct fb_var_screeninfo*, struct fb_fix_screeninfo*);
......
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