staging: xgifb: vb_setmode: make XGI_XG21BLSignalVDD() static

XGI_XG21BLSignalVDD() 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 8069246c36072bfaff8a057c26f5e25b9940dc86..abf89763fddb03a88a739db4d884f847e3c1dfee 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -3753,6 +3753,41 @@ static unsigned char XGI_XG27GetPSCValue(struct vb_device_info *pVBInfo)
        return temp;
 }
 
+/*----------------------------------------------------------------------------*/
+/* input                                                                      */
+/*      bl[5] : 1;LVDS signal on                                              */
+/*      bl[1] : 1;LVDS backlight on                                           */
+/*      bl[0] : 1:LVDS VDD on                                                 */
+/*      bh: 100000b : clear bit 5, to set bit5                                */
+/*          000010b : clear bit 1, to set bit1                                */
+/*          000001b : clear bit 0, to set bit0                                */
+/*----------------------------------------------------------------------------*/
+static void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
+               struct vb_device_info *pVBInfo)
+{
+       unsigned char CR4A, temp;
+
+       CR4A = xgifb_reg_get(pVBInfo->P3d4, 0x4A);
+       tempbh &= 0x23;
+       tempbl &= 0x23;
+       xgifb_reg_and(pVBInfo->P3d4, 0x4A, ~tempbh); /* enable GPIO write */
+
+       if (tempbh & 0x20) {
+               temp = (tempbl >> 4) & 0x02;
+
+               /* CR B4[1] */
+               xgifb_reg_and_or(pVBInfo->P3d4, 0xB4, ~0x02, temp);
+
+       }
+
+       temp = xgifb_reg_get(pVBInfo->P3d4, 0x48);
+
+       temp = XG21GPIODataTransfer(temp);
+       temp &= ~tempbh;
+       temp |= tempbl;
+       xgifb_reg_set(pVBInfo->P3d4, 0x48, temp);
+}
+
 void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE,
                struct vb_device_info *pVBInfo)
 {
@@ -5948,41 +5983,6 @@ static void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension,
        xgifb_reg_and_or(pVBInfo->P3d4, 0x63, 0xBF, 0x00);
 }
 
-/*----------------------------------------------------------------------------*/
-/* input                                                                      */
-/*      bl[5] : 1;LVDS signal on                                              */
-/*      bl[1] : 1;LVDS backlight on                                           */
-/*      bl[0] : 1:LVDS VDD on                                                 */
-/*      bh: 100000b : clear bit 5, to set bit5                                */
-/*          000010b : clear bit 1, to set bit1                                */
-/*          000001b : clear bit 0, to set bit0                                */
-/*----------------------------------------------------------------------------*/
-void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
-               struct vb_device_info *pVBInfo)
-{
-       unsigned char CR4A, temp;
-
-       CR4A = xgifb_reg_get(pVBInfo->P3d4, 0x4A);
-       tempbh &= 0x23;
-       tempbl &= 0x23;
-       xgifb_reg_and(pVBInfo->P3d4, 0x4A, ~tempbh); /* enable GPIO write */
-
-       if (tempbh & 0x20) {
-               temp = (tempbl >> 4) & 0x02;
-
-               /* CR B4[1] */
-               xgifb_reg_and_or(pVBInfo->P3d4, 0xB4, ~0x02, temp);
-
-       }
-
-       temp = xgifb_reg_get(pVBInfo->P3d4, 0x48);
-
-       temp = XG21GPIODataTransfer(temp);
-       temp &= ~tempbh;
-       temp |= tempbl;
-       xgifb_reg_set(pVBInfo->P3d4, 0x48, temp);
-}
-
 void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
                struct vb_device_info *pVBInfo)
 {

diff --git a/drivers/staging/xgifb/vb_setmode.h b/drivers/staging/xgifb/vb_setmode.h
index 9cc0f0d9306f175dcd22e4b1ddf4ea02e9d136e4..096646349dce0d53e292cbeb6f57c0cc2ac701aa 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.h
+++ b/drivers/staging/xgifb/vb_setmode.h
@@ -47,9 +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_XG21BLSignalVDD(unsigned short tempbh,
-                               unsigned short tempbl,
-                               struct vb_device_info *pVBInfo);
 extern void XGI_XG27BLSignalVDD(unsigned short tempbh,
                                unsigned short tempbl,
                                struct vb_device_info *pVBInfo);