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: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 4d261d56105313f33bbd527faa59808039b92ba0..646d2814ea5569e71740fdc636ed1a3cf6d8cdc6 100644 (file)
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -588,10 +588,7 @@ static int lynxfb_ops_check_var(struct fb_var_screeninfo *var,
                return -ENOMEM;
        }
 
-       ret = output->proc_checkMode(output, var);
-       if (!ret)
-               ret = crtc->proc_checkMode(crtc, var);
-       return ret;
+       return crtc->proc_checkMode(crtc, var);
 }
 
 static int lynxfb_ops_setcolreg(unsigned regno,
@@ -690,7 +687,6 @@ static int sm750fb_set_drv(struct lynxfb_par *par)
        crtc->ywrapstep = 0;
 
        output->proc_setMode = hw_sm750_output_setMode;
-       output->proc_checkMode = hw_sm750_output_checkMode;
 
        output->proc_setBLANK = (share->revid == SM750LE_REVISION_ID) ?
                                 hw_sm750le_setBLANK : hw_sm750_setBLANK;

diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index b2f05f4595054112e93d9b6d4de0fbd551527b20..1f365aeb5c9778005fce78b7364b38ff443f8d12 100644 (file)
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -143,7 +143,6 @@ struct lynxfb_output {
                                                struct fb_var_screeninfo*,
                                                struct fb_fix_screeninfo*);
 
-       int (*proc_checkMode)(struct lynxfb_output*, struct fb_var_screeninfo*);
        int (*proc_setBLANK)(struct lynxfb_output*, int);
        void  (*clear)(struct lynxfb_output *);
 };

diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
index 52f5b0eb9bd2a61086a92176012bb659af037cd5..9c2c28ac5639417659e04a3a9cf8b2026f5f4226 100644 (file)
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -190,15 +190,6 @@ resource_size_t hw_sm750_getVMSize(struct lynx_share *share)
        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,
                                                                        struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix)
 {

diff --git a/drivers/staging/sm750fb/sm750_hw.h b/drivers/staging/sm750fb/sm750_hw.h
index 3781a1a11c6832115d27ba827d0110508394bc2c..a4d66bf346dc505cf4ef5bd8c0a86fe25828b3b3 100644 (file)
--- a/drivers/staging/sm750fb/sm750_hw.h
+++ b/drivers/staging/sm750fb/sm750_hw.h
@@ -85,7 +85,6 @@ int hw_sm750_deWait(void);
 int hw_sm750le_deWait(void);
 
 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_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*);