staging/xgifb: drop RelIO from vb_device_info

The RelIO field is unused in the driver, drop it.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 641fd8d18242d3d2a2dbaec09090bdb2e419826a..bc542a57d2a09d92c7bfe3b744da069dccba418c 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -358,7 +358,6 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
 
 static void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)
 {
-       XGI_Pr->RelIO = BaseAddr;
        XGI_Pr->P3c4 = BaseAddr + 0x14;
        XGI_Pr->P3d4 = BaseAddr + 0x24;
        XGI_Pr->P3c0 = BaseAddr + 0x10;
@@ -1911,11 +1910,9 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
        xgifb_info->mmio_base = pci_resource_start(pdev, 1);
        xgifb_info->mmio_size = pci_resource_len(pdev, 1);
        xgifb_info->vga_base = pci_resource_start(pdev, 2) + 0x30;
-       hw_info->pjIOAddress = (unsigned char *)xgifb_info->vga_base;
-       /* XGI_Pr.RelIO  = ioremap(pci_resource_start(pdev, 2), 128) + 0x30; */
        pr_info("Relocate IO address: %lx [%08lx]\n",
               (unsigned long)pci_resource_start(pdev, 2),
-              xgifb_info->dev_info.RelIO);
+              xgifb_info->vga_base);
 
        if (pci_enable_device(pdev)) {
                ret = -EIO;

diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index a5bd56af92b1d84aff0618d62abeba991151f3d7..9287658eea033b685bdbbc164af3de53ba26d00a 100644 (file)
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -236,7 +236,6 @@ struct vb_device_info {
 
        void __iomem *FBAddr;
        unsigned long BaseAddr;
-       unsigned long RelIO;
 
        unsigned char (*CR6B)[4];
        unsigned char (*CR6E)[4];