]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
staging: xgifb: vb_setmode: inline XGI_SetMiscRegs()
authorAaro Koskinen <aaro.koskinen@iki.fi>
Sun, 27 Nov 2011 21:03:15 +0000 (23:03 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 21:20:13 +0000 (06:20 +0900)
Inline a trivial function.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/xgifb/vb_setmode.c

index fddf331e4db63bc7b77c82a7fd63ea23688da02c..9f11daf84081dd22e13df58a874682a9135c84df 100644 (file)
@@ -236,28 +236,6 @@ static void XGI_SetSeqRegs(unsigned short ModeNo,
        }
 }
 
-static void XGI_SetMiscRegs(unsigned short StandTableIndex,
-                           struct vb_device_info *pVBInfo)
-{
-       unsigned char Miscdata;
-
-       /* Get Misc from file */
-       Miscdata = pVBInfo->StandTable[StandTableIndex].MISC;
-       /*
-       if (pVBInfo->VBType & (VB_XGI301B |
-                              VB_XGI302B |
-                              VB_XGI301LV |
-                              VB_XGI302LV |
-                              VB_XGI301C)) {
-               if (pVBInfo->VBInfo & SetCRT2ToLCDA) {
-                       Miscdata |= 0x0C;
-               }
-       }
-       */
-
-       outb(Miscdata, pVBInfo->P3c2); /* Set Misc(3c2) */
-}
-
 static void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension,
                            unsigned short StandTableIndex,
                            struct vb_device_info *pVBInfo)
@@ -7663,7 +7641,7 @@ static void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension,
        /* XGI_SetBIOSData(ModeNo, ModeIdIndex); */
        /* XGI_ClearBankRegs(ModeNo, ModeIdIndex); */
        XGI_SetSeqRegs(ModeNo, StandTableIndex, ModeIdIndex, pVBInfo);
-       XGI_SetMiscRegs(StandTableIndex, pVBInfo);
+       outb(pVBInfo->StandTable[StandTableIndex].MISC, pVBInfo->P3c2);
        XGI_SetCRTCRegs(HwDeviceExtension, StandTableIndex, pVBInfo);
        XGI_SetATTRegs(ModeNo, StandTableIndex, ModeIdIndex, pVBInfo);
        XGI_SetGRCRegs(StandTableIndex, pVBInfo);