diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-10-11 21:47:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-12 09:51:48 -0600 |
| commit | f2df8c097a3cf0436c22358e11033c2d3b320aa4 (patch) | |
| tree | 7cd2e96576637e611a2d281089dddf26de386e96 /drivers/staging/xgifb/XGI_main_26.c | |
| parent | 7d2ab0c62dd3eb283853340e8aab095bdb6f6ac7 (diff) | |
| download | op-kernel-dev-f2df8c097a3cf0436c22358e11033c2d3b320aa4.zip op-kernel-dev-f2df8c097a3cf0436c22358e11033c2d3b320aa4.tar.gz | |
staging: xgifb: eliminate global XGI_Pr data
Move vb_device_info into xgifb_video_info.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index bbbcdb7..dc6a9a8 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -1650,6 +1650,7 @@ static int XGIfb_pan_display(struct fb_var_screeninfo *var, static int XGIfb_blank(int blank, struct fb_info *info) { + struct xgifb_video_info *xgifb_info = info->par; u8 reg; reg = xgifb_reg_get(XGICR, 0x17); @@ -2002,14 +2003,15 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, hw_info->pjIOAddress = (unsigned char *)xgifb_info->vga_base; /* XGI_Pr.RelIO = ioremap(pci_resource_start(pdev, 2), 128) + 0x30; */ printk("XGIfb: Relocate IO address: %lx [%08lx]\n", - (unsigned long)pci_resource_start(pdev, 2), XGI_Pr.RelIO); + (unsigned long)pci_resource_start(pdev, 2), + xgifb_info->dev_info.RelIO); if (pci_enable_device(pdev)) { ret = -EIO; goto error; } - XGIRegInit(&XGI_Pr, (unsigned long)hw_info->pjIOAddress); + XGIRegInit(&xgifb_info->dev_info, (unsigned long)hw_info->pjIOAddress); xgifb_reg_set(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD); reg1 = xgifb_reg_get(XGISR, IND_XGI_PASSWORD); @@ -2292,7 +2294,9 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, XGIbios_mode[xgifb_info->mode_idx].xres) && (XGI21_LCDCapList[m].LVDSVDE == XGIbios_mode[xgifb_info->mode_idx].yres)) { - xgifb_reg_set(XGI_Pr.P3d4, 0x36, m); + xgifb_reg_set(xgifb_info->dev_info.P3d4, + 0x36, + m); break; } } @@ -2364,11 +2368,12 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, XGIfb_bpp_to_var(xgifb_info, &fb_info->var); fb_info->var.pixclock = (u32) (1000000000 / - XGIfb_mode_rate_to_dclock(&XGI_Pr, hw_info, + XGIfb_mode_rate_to_dclock(&xgifb_info->dev_info, + hw_info, XGIbios_mode[xgifb_info->mode_idx].mode_no, xgifb_info->rate_idx)); - if (XGIfb_mode_rate_to_ddata(&XGI_Pr, hw_info, + if (XGIfb_mode_rate_to_ddata(&xgifb_info->dev_info, hw_info, XGIbios_mode[xgifb_info->mode_idx].mode_no, xgifb_info->rate_idx, &fb_info->var.left_margin, |
