From 4dc4d225550e12bb0526a2dc05c0073f44121714 Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Thu, 1 Oct 2015 12:14:04 +0300 Subject: [PATCH] staging: sm750fb: remove clear method from lynxfb_{crtc,output} The clear methods of lynxfb_crtc and lynxfb_output are empty and therefore they can be removed. Signed-off-by: Mike Rapoport Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/sm750.c | 5 ----- drivers/staging/sm750fb/sm750.h | 2 -- drivers/staging/sm750fb/sm750_hw.c | 12 ------------ drivers/staging/sm750fb/sm750_hw.h | 2 -- 4 files changed, 21 deletions(-) diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index 646d2814ea55..494017f5235c 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -680,7 +680,6 @@ static int sm750fb_set_drv(struct lynxfb_par *par) crtc->proc_checkMode = hw_sm750_crtc_checkMode; crtc->proc_setColReg = hw_sm750_setColReg; crtc->proc_panDisplay = hw_sm750_pan_display; - crtc->clear = hw_sm750_crtc_clear; crtc->line_pad = 16; crtc->xpanstep = 8; crtc->ypanstep = 1; @@ -690,7 +689,6 @@ static int sm750fb_set_drv(struct lynxfb_par *par) output->proc_setBLANK = (share->revid == SM750LE_REVISION_ID) ? hw_sm750le_setBLANK : hw_sm750_setBLANK; - output->clear = hw_sm750_output_clear; /* chip specific phase */ share->accel.de_wait = (share->revid == SM750LE_REVISION_ID) ? hw_sm750le_deWait : hw_sm750_deWait; @@ -1219,9 +1217,6 @@ static void lynxfb_pci_remove(struct pci_dev *pdev) par = info->par; unregister_framebuffer(info); - /* clean crtc & output allocations */ - par->crtc.clear(&par->crtc); - par->output.clear(&par->output); /* release frame buffer */ framebuffer_release(info); } diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index 1f365aeb5c97..52fe945101c8 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h @@ -113,7 +113,6 @@ struct lynxfb_crtc { int (*proc_checkMode)(struct lynxfb_crtc*, struct fb_var_screeninfo*); int (*proc_setColReg)(struct lynxfb_crtc*, ushort, ushort, ushort, ushort); - void (*clear)(struct lynxfb_crtc *); /* pan display */ int (*proc_panDisplay)(struct lynxfb_crtc *, const struct fb_var_screeninfo *, @@ -144,7 +143,6 @@ struct lynxfb_output { struct fb_fix_screeninfo*); int (*proc_setBLANK)(struct lynxfb_output*, int); - void (*clear)(struct lynxfb_output *); }; struct lynxfb_par { diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c index 9c2c28ac5639..92e194ddb15a 100644 --- a/drivers/staging/sm750fb/sm750_hw.c +++ b/drivers/staging/sm750fb/sm750_hw.c @@ -232,12 +232,6 @@ int hw_sm750_output_setMode(struct lynxfb_output *output, return ret; } -void hw_sm750_output_clear(struct lynxfb_output *output) -{ - - return; -} - int hw_sm750_crtc_checkMode(struct lynxfb_crtc *crtc, struct fb_var_screeninfo *var) { struct lynx_share *share; @@ -387,12 +381,6 @@ exit: return ret; } -void hw_sm750_crtc_clear(struct lynxfb_crtc *crtc) -{ - - return; -} - int hw_sm750_setColReg(struct lynxfb_crtc *crtc, ushort index, ushort red, ushort green, ushort blue) { diff --git a/drivers/staging/sm750fb/sm750_hw.h b/drivers/staging/sm750fb/sm750_hw.h index a4d66bf346dc..cc8c76d0c1d2 100644 --- a/drivers/staging/sm750fb/sm750_hw.h +++ b/drivers/staging/sm750fb/sm750_hw.h @@ -91,8 +91,6 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc*, struct fb_var_screeninfo*, struct int hw_sm750_setColReg(struct lynxfb_crtc*, ushort, ushort, ushort, ushort); int hw_sm750_setBLANK(struct lynxfb_output*, int); int hw_sm750le_setBLANK(struct lynxfb_output*, int); -void hw_sm750_crtc_clear(struct lynxfb_crtc *); -void hw_sm750_output_clear(struct lynxfb_output *); int hw_sm750_pan_display(struct lynxfb_crtc *crtc, const struct fb_var_screeninfo *var, const struct fb_info *info); -- 2.11.0