staging: xgifb: vb_setmode: make XGI_GetResInfo() static

XGI_GetResInfo() 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>

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index a2b37eb0076eb4f7549aeee218e6adb598896ae0..5cadfbd6cdd2b48e575f5e705be594a676d3da0e 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -1088,6 +1088,20 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
        }
 }
 
+static unsigned short XGI_GetResInfo(unsigned short ModeNo,
+               unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
+{
+       unsigned short resindex;
+
+       if (ModeNo <= 0x13)
+               /* si+St_ResInfo */
+               resindex = pVBInfo->SModeIDTable[ModeIdIndex].St_ResInfo;
+       else
+               /* si+Ext_ResInfo */
+               resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
+       return resindex;
+}
+
 static void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension,
                unsigned short ModeNo, unsigned short ModeIdIndex,
                unsigned short RefreshRateTableIndex,
@@ -1163,20 +1177,6 @@ static void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension,
        xgifb_reg_set(pVBInfo->P3d4, 0x11, temp);
 }
 
-unsigned short XGI_GetResInfo(unsigned short ModeNo,
-               unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
-{
-       unsigned short resindex;
-
-       if (ModeNo <= 0x13)
-               /* si+St_ResInfo */
-               resindex = pVBInfo->SModeIDTable[ModeIdIndex].St_ResInfo;
-       else
-               /* si+Ext_ResInfo */
-               resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-       return resindex;
-}
-
 static void XGI_SetCRT1Offset(unsigned short ModeNo,
                              unsigned short ModeIdIndex,
                              unsigned short RefreshRateTableIndex,

diff --git a/drivers/staging/xgifb/vb_setmode.h b/drivers/staging/xgifb/vb_setmode.h
index 6428351fe179d45d3776bf42a5bbf28c01a05d8f..8837568dd960aeb54b06868722bdc45b4ec60d1e 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.h
+++ b/drivers/staging/xgifb/vb_setmode.h
@@ -28,10 +28,6 @@ extern void XGI_GetVBInfo(unsigned short ModeNo,
 extern void XGI_GetTVInfo(unsigned short ModeNo,
                          unsigned short ModeIdIndex,
                          struct vb_device_info *);
-extern unsigned short XGI_GetResInfo(unsigned short ModeNo,
-                                    unsigned short ModeIdIndex,
-                                    struct vb_device_info *pVBInfo);
-
 extern unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
                                   unsigned short ModeNo) ;