staging: xgifb: use correct type for VBVCLKData

Use correct type to eliminate casting.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 0ed8036a77775778a2654997d590877c074905ac..ef8775e27055762a8a813566b526553b88355930 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -32,7 +32,7 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
        pVBInfo->MCLKData = (struct SiS_MCLKData *) XGI340New_MCLKData;
        pVBInfo->ECLKData = (struct XGI_ECLKDataStruct *) XGI340_ECLKData;
        pVBInfo->VCLKData = (struct SiS_VCLKData *) XGI_VCLKData;
-       pVBInfo->VBVCLKData = (struct SiS_VBVCLKData *) XGI_VBVCLKData;
+       pVBInfo->VBVCLKData = XGI_VBVCLKData;
        pVBInfo->ScreenOffset = XGI330_ScreenOffset;
        pVBInfo->StResInfo = (struct SiS_StResInfo_S *) XGI330_StResInfo;
        pVBInfo->ModeResInfo
@@ -2276,8 +2276,8 @@ static void XGI_GetVCLKLen(unsigned char tempal, unsigned char *di_0,
                        | VB_SIS301LV | VB_SIS302LV | VB_XGI301C)) {
                if ((!(pVBInfo->VBInfo & XGI_SetCRT2ToLCDA)) &&
                    (pVBInfo->SetFlag & ProgrammingCRT2)) {
-                       *di_0 = (unsigned char) XGI_VBVCLKData[tempal].SR2B;
-                       *di_1 = XGI_VBVCLKData[tempal].SR2C;
+                       *di_0 = XGI_VBVCLKData[tempal].Part4_A;
+                       *di_1 = XGI_VBVCLKData[tempal].Part4_C;
                }
        } else {
                *di_0 = XGI_VCLKData[tempal].SR2B;

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index 4f45d03bdbf8bfe7ff27d8869ef6c3d4e7ea6336..180aae042ceaa9f1318bfeb197b1b685be029f17 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -2234,7 +2234,7 @@ static struct SiS_VCLKData XGI_VCLKData[] = {
        {0xFF, 0x00,   0}  /* End mark */
 };
 
-static struct SiS_VCLKData XGI_VBVCLKData[] = {
+static struct SiS_VBVCLKData XGI_VBVCLKData[] = {
        {0x1B, 0xE1,  25}, /* 00 (25.175MHz) */
        {0x4E, 0xE4,  28}, /* 01 (28.322MHz) */
        {0x57, 0xE4,  31}, /* 02 (31.500MHz) */