aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-11-27 23:03:11 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-28 06:20:12 +0900
commit9913b6c0d72e74dfe2acdddd94f7e10e1b089884 (patch)
tree0286d48618d5c6cf47df06efea27e12357ea53e6 /drivers/staging/xgifb
parentstaging: xgifb: vb_setmode: make XGI_XG27BLSignalVDD() static (diff)
downloadlinux-dev-9913b6c0d72e74dfe2acdddd94f7e10e1b089884.tar.xz
linux-dev-9913b6c0d72e74dfe2acdddd94f7e10e1b089884.zip
staging: xgifb: vb_setmode: make XGI_XG21SetPanelDelay() static
XGI_XG21SetPanelDelay() can be made static. Move the function, so that forward declaration is not needed. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb')
-rw-r--r--drivers/staging/xgifb/vb_setmode.c58
-rw-r--r--drivers/staging/xgifb/vb_setmode.h2
2 files changed, 29 insertions, 31 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 259474f25846..bc035dbde3b3 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -3819,6 +3819,35 @@ static void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
xgifb_reg_and_or(pVBInfo->P3d4, 0x48, ~tempbh, tempbl);
}
+/* --------------------------------------------------------------------- */
+/* Function : XGI_XG21SetPanelDelay */
+/* Input : */
+/* Output : */
+/* Description : */
+/* I/P : bl : 1 ; T1 : the duration between CPL on and signal on */
+/* : bl : 2 ; T2 : the duration signal on and Vdd on */
+/* : bl : 3 ; T3 : the duration between CPL off and signal off */
+/* : bl : 4 ; T4 : the duration signal off and Vdd off */
+/* --------------------------------------------------------------------- */
+static void XGI_XG21SetPanelDelay(unsigned short tempbl,
+ struct vb_device_info *pVBInfo)
+{
+ unsigned short index;
+
+ index = XGI_GetLVDSOEMTableIndex(pVBInfo);
+ if (tempbl == 1)
+ mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S1);
+
+ if (tempbl == 2)
+ mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S2);
+
+ if (tempbl == 3)
+ mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S3);
+
+ if (tempbl == 4)
+ mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S4);
+}
+
void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE,
struct vb_device_info *pVBInfo)
{
@@ -6026,35 +6055,6 @@ unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo)
return 0;
}
-/* --------------------------------------------------------------------- */
-/* Function : XGI_XG21SetPanelDelay */
-/* Input : */
-/* Output : */
-/* Description : */
-/* I/P : bl : 1 ; T1 : the duration between CPL on and signal on */
-/* : bl : 2 ; T2 : the duration signal on and Vdd on */
-/* : bl : 3 ; T3 : the duration between CPL off and signal off */
-/* : bl : 4 ; T4 : the duration signal off and Vdd off */
-/* --------------------------------------------------------------------- */
-void XGI_XG21SetPanelDelay(unsigned short tempbl,
- struct vb_device_info *pVBInfo)
-{
- unsigned short index;
-
- index = XGI_GetLVDSOEMTableIndex(pVBInfo);
- if (tempbl == 1)
- mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S1);
-
- if (tempbl == 2)
- mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S2);
-
- if (tempbl == 3)
- mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S3);
-
- if (tempbl == 4)
- mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S4);
-}
-
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 119884a31852..a91104469cf3 100644
--- a/drivers/staging/xgifb/vb_setmode.h
+++ b/drivers/staging/xgifb/vb_setmode.h
@@ -47,8 +47,6 @@ extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
unsigned short ModeNo,
unsigned short ModeIdIndex,
struct vb_device_info *);
-extern void XGI_XG21SetPanelDelay(unsigned short tempbl,
- struct vb_device_info *pVBInfo);
extern unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,
unsigned short ModeIdIndex,
struct vb_device_info *pVBInfo);