staging: xgifb: vb_setmode: eliminate GetVGAType/Set_VGAType

Eliminate unneeded function and struct field. The same information is
available in HwDeviceExtension->jChipType.

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 083c43cacba211edf4478b2ead7ff036c44f4999..fddf331e4db63bc7b77c82a7fd63ea23688da02c 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -3132,19 +3132,6 @@ static void XGI_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension,
        }
 }
 
-static void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension,
-               struct vb_device_info *pVBInfo)
-{
-       /*
-       if ( HwDeviceExtension->jChipType >= XG20 ) {
-               pVBInfo->Set_VGAType = XG20;
-       } else {
-               pVBInfo->Set_VGAType = VGA_XGI340;
-       }
-       */
-       pVBInfo->Set_VGAType = HwDeviceExtension->jChipType;
-}
-
 void XGI_GetVBType(struct vb_device_info *pVBInfo)
 {
        unsigned short flag, tempbx, tempah;
@@ -3220,8 +3207,8 @@ static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
 
                if (pVBInfo->IF_DEF_LCDA == 1) {
 
-                       if ((pVBInfo->Set_VGAType >= XG20)
-                                       || (pVBInfo->Set_VGAType >= XG40)) {
+                       if ((HwDeviceExtension->jChipType >= XG20) ||
+                           (HwDeviceExtension->jChipType >= XG40)) {
                                if (pVBInfo->IF_DEF_LVDS == 0) {
                                        /* if ((pVBInfo->VBType & VB_XGI302B)
                                            || (pVBInfo->VBType & VB_XGI301LV)
@@ -7845,8 +7832,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
 
        XGI_SearchModeID(ModeNo, &ModeIdIndex, pVBInfo);
 
-       XGI_GetVGAType(HwDeviceExtension, pVBInfo);
-
        if (HwDeviceExtension->jChipType < XG20) { /* kuku 2004/06/25 */
                XGI_GetVBInfo(ModeNo, ModeIdIndex, HwDeviceExtension, pVBInfo);
                XGI_GetTVInfo(ModeNo, ModeIdIndex, pVBInfo);

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index f9ade6f9f7ee067df0cee1b77f02cd66c5d63635..177dfa67d01c9d17fde734bff83968dfa3083d69 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -293,7 +293,7 @@ struct vb_device_info {
        unsigned short   IF_DEF_ExpLink;
        unsigned short   IF_DEF_HiVision;
        unsigned short   LCDResInfo, LCDTypeInfo, VBType;/*301b*/
-       unsigned short   VBInfo, TVInfo, LCDInfo, Set_VGAType;
+       unsigned short   VBInfo, TVInfo, LCDInfo;
        unsigned short   VBExtInfo;/*301lv*/
        unsigned short   SetFlag;
        unsigned short   NewFlickerMode;