staging: xgifb: delete ROMAddr

Delete a redundant struct member.

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

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 5d1064c644d0c91abdead7a2c1977b8d0e63cc13..6eb49748af9dd6e342b539f3e53932ab4179c7b4 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -156,7 +156,6 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
 
        /* unsigned long  temp = 0; */
        int Clock;
-       XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
        InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);
 
        RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
@@ -196,7 +195,6 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
        unsigned char sr_data, cr_data, cr_data2;
        unsigned long cr_data3;
        int A, B, C, D, E, F, temp, j;
-       XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
        InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);
        RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
                        ModeIdIndex, XGI_Pr);

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index cebed6a34181cb3b05a7077691180ba971fc88d8..2a5b35d15a5dbab616e1d0ff9ed672295001a94f 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1075,7 +1075,6 @@ static void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension,
 {
        unsigned short data;
 
-       pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
        pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress;
 
        XGISetModeNew(HwDeviceExtension, 0x2e);
@@ -1453,24 +1452,15 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
        struct vb_device_info *pVBInfo = &VBINF;
        unsigned char i, temp = 0, temp1;
        /* VBIOSVersion[5]; */
-       volatile unsigned char *pVideoMemory;
 
        /* unsigned long j, k; */
 
-       pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
-
        pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress;
 
        pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
 
-       pVideoMemory = (unsigned char *) pVBInfo->ROMAddr;
-
        /* Newdebugcode(0x99); */
 
-
-       /* if (pVBInfo->ROMAddr == 0) */
-       /* return(0); */
-
        if (pVBInfo->FBAddr == NULL) {
                printk("\n pVBInfo->FBAddr == 0 ");
                return 0;

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index a3d6097628e4dcf1e4f77241501040f4a7faabba..31c892736ba8f0baf808d750297b1dc9208edaeb 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -7409,7 +7409,6 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
        unsigned short ModeIdIndex;
        struct vb_device_info VBINF;
        struct vb_device_info *pVBInfo = &VBINF;
-       pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
        pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
        pVBInfo->IF_DEF_LVDS = 0;
        pVBInfo->IF_DEF_LCDA = 1;

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index 177dfa67d01c9d17fde734bff83968dfa3083d69..a8004f71611c492549673d63f27749162f10bef3 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -299,7 +299,6 @@ struct vb_device_info {
        unsigned short   NewFlickerMode;
        unsigned short   SelectCRT2Rate;
 
-       unsigned char *ROMAddr;
        void __iomem *FBAddr;
        unsigned long BaseAddr;
        unsigned long RelIO;