staging: xgifb: move XGINew_SenseLCD() to vb_init.c

The function is used only in vb_init.c, so move it there and make
it static.

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_ext.c b/drivers/staging/xgifb/vb_ext.c
index f85d7d64d4186238874086af8ec0a50882682edf..ee890005ed08d32827f363afe3e869366bc3d0e5 100644 (file)
--- a/drivers/staging/xgifb/vb_ext.c
+++ b/drivers/staging/xgifb/vb_ext.c
@@ -13,45 +13,3 @@
  *********************** Dynamic Sense ************************
  *************************************************************/
 
-unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension,
-                    struct vb_device_info *pVBInfo)
-{
-       unsigned short temp;
-
-       /* add lcd sense */
-       if (HwDeviceExtension->ulCRT2LCDType == LCD_UNKNOWN) {
-               return 0;
-       } else {
-               temp = (unsigned short) HwDeviceExtension->ulCRT2LCDType;
-               switch (HwDeviceExtension->ulCRT2LCDType) {
-               case LCD_INVALID:
-               case LCD_800x600:
-               case LCD_1024x768:
-               case LCD_1280x1024:
-                       break;
-
-               case LCD_640x480:
-               case LCD_1024x600:
-               case LCD_1152x864:
-               case LCD_1280x960:
-               case LCD_1152x768:
-                       temp = 0;
-                       break;
-
-               case LCD_1400x1050:
-               case LCD_1280x768:
-               case LCD_1600x1200:
-                       break;
-
-               case LCD_1920x1440:
-               case LCD_2048x1536:
-                       temp = 0;
-                       break;
-
-               default:
-                       break;
-               }
-               xgifb_reg_and_or(pVBInfo->P3d4, 0x36, 0xF0, temp);
-               return 1;
-       }
-}

diff --git a/drivers/staging/xgifb/vb_ext.h b/drivers/staging/xgifb/vb_ext.h
index 98c026c2ea642dfcf1fa8c2c9a120446049827c7..894223d115035b7c63bcb857e2aee7fc9bba620a 100644 (file)
--- a/drivers/staging/xgifb/vb_ext.h
+++ b/drivers/staging/xgifb/vb_ext.h
@@ -1,7 +1,4 @@
 #ifndef _VBEXT_
 #define _VBEXT_
 
-extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *,
-                                     struct vb_device_info *pVBInfo);
-
 #endif

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 9e890a17fbc232b324ab645a1b8d74a82c9b4ec5..159ac02e52131b4d654a26e8f04b4b0d175f45e8 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1336,6 +1336,50 @@ static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension,
 
 }
 
+static unsigned short XGINew_SenseLCD(struct xgi_hw_device_info
+                                                       *HwDeviceExtension,
+                                     struct vb_device_info *pVBInfo)
+{
+       unsigned short temp;
+
+       /* add lcd sense */
+       if (HwDeviceExtension->ulCRT2LCDType == LCD_UNKNOWN) {
+               return 0;
+       } else {
+               temp = (unsigned short) HwDeviceExtension->ulCRT2LCDType;
+               switch (HwDeviceExtension->ulCRT2LCDType) {
+               case LCD_INVALID:
+               case LCD_800x600:
+               case LCD_1024x768:
+               case LCD_1280x1024:
+                       break;
+
+               case LCD_640x480:
+               case LCD_1024x600:
+               case LCD_1152x864:
+               case LCD_1280x960:
+               case LCD_1152x768:
+                       temp = 0;
+                       break;
+
+               case LCD_1400x1050:
+               case LCD_1280x768:
+               case LCD_1600x1200:
+                       break;
+
+               case LCD_1920x1440:
+               case LCD_2048x1536:
+                       temp = 0;
+                       break;
+
+               default:
+                       break;
+               }
+               xgifb_reg_and_or(pVBInfo->P3d4, 0x36, 0xF0, temp);
+               return 1;
+       }
+}
+
 static void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension,
                struct vb_device_info *pVBInfo)
 {