diff options
| author | Mike Rapoport <mike.rapoport@gmail.com> | 2015-10-01 12:14:03 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-02 11:50:52 +0200 |
| commit | efca4885b2b86d9c1a2eb579f6e9d573d44896f8 (patch) | |
| tree | 580981351e6e9129ef610c5151863dbc9c00ffcf /drivers/staging | |
| parent | 104f456ce1301fa49f7dffc129c0bce420da07df (diff) | |
| download | op-kernel-dev-efca4885b2b86d9c1a2eb579f6e9d573d44896f8.zip op-kernel-dev-efca4885b2b86d9c1a2eb579f6e9d573d44896f8.tar.gz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/sm750fb/sm750.c | 6 | ||||
| -rw-r--r-- | drivers/staging/sm750fb/sm750.h | 1 | ||||
| -rw-r--r-- | drivers/staging/sm750fb/sm750_hw.c | 9 | ||||
| -rw-r--r-- | drivers/staging/sm750fb/sm750_hw.h | 1 |
4 files changed, 1 insertions, 16 deletions
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 4d261d5..646d281 100644 --- 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 b2f05f4..1f365ae 100644 --- 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 52f5b0e..9c2c28a 100644 --- 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 3781a1a..a4d66bf 100644 --- 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*); |
