From: Aaro Koskinen Date: Mon, 21 Jan 2013 00:57:49 +0000 (+0200) Subject: staging: xgifb: delete pVBInfo->BaseAddr X-Git-Tag: Ubuntu-5.10.0-12.13~19709^2~358 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cdbbc618f8f483d72e82af05f2873621cc9c2314;p=mirror_ubuntu-hirsute-kernel.git staging: xgifb: delete pVBInfo->BaseAddr Delete redundant field. Signed-off-by: Aaro Koskinen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 311541571757..dd34570347aa 100644 --- 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 3e9f9d6e743a..53b55571fec6 100644 --- 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 acf6e7fbbaed..e570baebd681 100644 --- 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];