Commit 30b76816 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Greg Kroah-Hartman

staging/xgifb: drop RelIO from vb_device_info

The RelIO field is unused in the driver, drop it.
Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef23b210
...@@ -358,7 +358,6 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, ...@@ -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) static void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)
{ {
XGI_Pr->RelIO = BaseAddr;
XGI_Pr->P3c4 = BaseAddr + 0x14; XGI_Pr->P3c4 = BaseAddr + 0x14;
XGI_Pr->P3d4 = BaseAddr + 0x24; XGI_Pr->P3d4 = BaseAddr + 0x24;
XGI_Pr->P3c0 = BaseAddr + 0x10; XGI_Pr->P3c0 = BaseAddr + 0x10;
...@@ -1911,11 +1910,9 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, ...@@ -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_base = pci_resource_start(pdev, 1);
xgifb_info->mmio_size = pci_resource_len(pdev, 1); xgifb_info->mmio_size = pci_resource_len(pdev, 1);
xgifb_info->vga_base = pci_resource_start(pdev, 2) + 0x30; 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", pr_info("Relocate IO address: %lx [%08lx]\n",
(unsigned long)pci_resource_start(pdev, 2), (unsigned long)pci_resource_start(pdev, 2),
xgifb_info->dev_info.RelIO); xgifb_info->vga_base);
if (pci_enable_device(pdev)) { if (pci_enable_device(pdev)) {
ret = -EIO; ret = -EIO;
......
...@@ -236,7 +236,6 @@ struct vb_device_info { ...@@ -236,7 +236,6 @@ struct vb_device_info {
void __iomem *FBAddr; void __iomem *FBAddr;
unsigned long BaseAddr; unsigned long BaseAddr;
unsigned long RelIO;
unsigned char (*CR6B)[4]; unsigned char (*CR6B)[4];
unsigned char (*CR6E)[4]; unsigned char (*CR6E)[4];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment