staging: xgifb: delete pVBInfo->BaseAddr

Delete redundant field.

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_init.c b/drivers/staging/xgifb/vb_init.c
index 311541571757b63549f2afab0497568906bbd709..dd34570347aa76007070fdd9396ef24a40de1eac 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1286,16 +1286,10 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
 
        pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress;
 
-       pVBInfo->BaseAddr = xgifb_info->vga_base;
-
        if (pVBInfo->FBAddr == NULL) {
                dev_dbg(&pdev->dev, "pVBInfo->FBAddr == 0\n");
                return 0;
        }
-       if (pVBInfo->BaseAddr == 0) {
-               dev_dbg(&pdev->dev, "pVBInfo->BaseAddr == 0\n");
-               return 0;
-       }
 
        XGIRegInit(pVBInfo, xgifb_info->vga_base);
 

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 3e9f9d6e743a9eea7c163476f2440a6ed4cd2c7d..53b55571fec64e0fb1e3f9b52604ebb6ee1ccedf 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -5948,7 +5948,6 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
        unsigned short ModeIdIndex;
        struct vb_device_info VBINF;
        struct vb_device_info *pVBInfo = &VBINF;
-       pVBInfo->BaseAddr = xgifb_info->vga_base;
        pVBInfo->IF_DEF_LVDS = 0;
 
        if (HwDeviceExtension->jChipType >= XG20) {

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index acf6e7fbbaed476493474b83b5ca4c4e79067953..e570baebd681c3108552a01eb7aed6b4b275627a 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -156,7 +156,6 @@ struct vb_device_info {
        unsigned short   SelectCRT2Rate;
 
        void __iomem *FBAddr;
-       unsigned long BaseAddr;
 
        unsigned char const (*SR15)[8];
        unsigned char const (*CR40)[8];