From ed2e7203c37d7413f0b0e1b2a342164b744b31e9 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Sun, 27 Nov 2011 23:03:12 +0200 Subject: [PATCH] staging: xgifb: vb_setmode: make XGI_GetLVDSOEMTableIndex() static XGI_GetLVDSOEMTableIndex() can be made static. Move the function, so that forward declaration is not needed. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/vb_setmode.c | 23 +++++++++++------------ drivers/staging/xgifb/vb_setmode.h | 1 - 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index bc035dbde3b3..3d5b343f7f13 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -3819,6 +3819,17 @@ static void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl, xgifb_reg_and_or(pVBInfo->P3d4, 0x48, ~tempbh, tempbl); } +static unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo) +{ + unsigned short index; + + index = xgifb_reg_get(pVBInfo->P3d4, 0x36); + if (index < sizeof(XGI21_LCDCapList) + / sizeof(struct XGI21_LVDSCapStruct)) + return index; + return 0; +} + /* --------------------------------------------------------------------- */ /* Function : XGI_XG21SetPanelDelay */ /* Input : */ @@ -6043,18 +6054,6 @@ static void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension, xgifb_reg_and_or(pVBInfo->P3d4, 0x63, 0xBF, 0x00); } -/* --------------------------------------------------------------------- */ -unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo) -{ - unsigned short index; - - index = xgifb_reg_get(pVBInfo->P3d4, 0x36); - if (index < sizeof(XGI21_LCDCapList) - / sizeof(struct XGI21_LVDSCapStruct)) - return index; - return 0; -} - unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo) { diff --git a/drivers/staging/xgifb/vb_setmode.h b/drivers/staging/xgifb/vb_setmode.h index a91104469cf3..aa065a7300df 100644 --- a/drivers/staging/xgifb/vb_setmode.h +++ b/drivers/staging/xgifb/vb_setmode.h @@ -50,6 +50,5 @@ extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, extern unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo, unsigned short ModeIdIndex, struct vb_device_info *pVBInfo); -extern unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo); #endif -- GitLab