Skip to content

Commit

Permalink
staging/xgifb: drop RelIO from vb_device_info
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Greg Kroah-Hartman committed Apr 10, 2012
1 parent ef23b21 commit 30b7681
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
5 changes: 1 addition & 4 deletions drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/xgifb/vb_struct.h
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit 30b7681

Please sign in to comment.