From 142de763c08e6ff1e4966b654654859ed7a5492c Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Mon, 26 Oct 2015 09:06:00 +0200 Subject: [PATCH] staging: sm750fb: remove hw_sm750_getVMSize function The hw_sm750_getVMSize wraps ddk750_getVMSize without any added functionality. Call ddk750_getVMSize directly and remove hw_sm750_getVMSize. Signed-off-by: Mike Rapoport Signed-off-by: Greg Kroah-Hartman --- drivers/staging/sm750fb/sm750.h | 1 - drivers/staging/sm750fb/sm750_hw.c | 13 ++----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index fde125905671..e9ddf2bec79b 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h @@ -202,7 +202,6 @@ void hw_sm750_initAccel(struct lynx_share *); int hw_sm750_deWait(void); int hw_sm750le_deWait(void); -resource_size_t hw_sm750_getVMSize(struct lynx_share *); 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*); diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c index 3ad82c2fe7dc..80cb7fe7bbd7 100644 --- a/drivers/staging/sm750fb/sm750_hw.c +++ b/drivers/staging/sm750fb/sm750_hw.c @@ -69,9 +69,9 @@ int hw_sm750_map(struct lynx_share *share, struct pci_dev *pdev) /* don't use pdev_resource[x].end - resource[x].start to * calculate the resource size,its only the maximum available * size but not the actual size,use - * @hw_sm750_getVMSize function can be safe. + * @ddk750_getVMSize function can be safe. * */ - share->vidmem_size = hw_sm750_getVMSize(share); + share->vidmem_size = ddk750_getVMSize(); pr_info("video memory phyAddr = %lx, size = %u bytes\n", share->vidmem_start, share->vidmem_size); @@ -180,15 +180,6 @@ int hw_sm750_inithw(struct lynx_share *share, struct pci_dev *pdev) return 0; } - -resource_size_t hw_sm750_getVMSize(struct lynx_share *share) -{ - resource_size_t ret; - - ret = ddk750_getVMSize(); - return ret; -} - int hw_sm750_output_setMode(struct lynxfb_output *output, struct fb_var_screeninfo *var, struct fb_fix_screeninfo *fix) { -- 2.45.2