diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-10-11 18:47:25 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-12 15:51:47 (GMT) |
| commit | 39f10bf18c80c98d9fec376beabe80b9c59c7498 (patch) | |
| tree | 9d7a7c158978a883f21af22e7c025921cd65a805 | |
| parent | 76cabaa42800ac3dd3d64e60fa3a18c1dfcbf791 (diff) | |
| download | linux-fsl-qoriq-39f10bf18c80c98d9fec376beabe80b9c59c7498.tar.xz | |
staging: xgifb: eliminate XGIfb_CRT2_write_enable variable
Replace XGIfb_CRT2_write_enable with IND_XGI_CRT2_WRITE_ENABLE_315.
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>
| -rw-r--r-- | drivers/staging/xgifb/XGI_main.h | 3 | ||||
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 11 |
2 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index e584f0b..7e5d029 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -171,9 +171,6 @@ static int XGIfb_tvmode; static int enable_dstn; static int XGIfb_ypan = -1; - -static int XGIfb_CRT2_write_enable; - /* TW: CRT2 type (for overriding autodetection) */ static int XGIfb_crt2type = -1; /* PR: Tv plug type (for overriding autodetection) */ diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 45427d7..8c9c187 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -967,7 +967,9 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info) filter = -1; break; } - xgifb_reg_or(XGIPART1, XGIfb_CRT2_write_enable, 0x01); + xgifb_reg_or(XGIPART1, + IND_XGI_CRT2_WRITE_ENABLE_315, + 0x01); if (xgifb_info->TV_type == TVMODE_NTSC) { @@ -1335,7 +1337,7 @@ static int XGIfb_pan_var(struct xgifb_video_info *xgifb_info, xgifb_reg_and_or(XGISR, 0x37, 0xDF, (base >> 21) & 0x04); if (xgifb_info->disp_state & DISPTYPE_DISP2) { - xgifb_reg_or(XGIPART1, XGIfb_CRT2_write_enable, 0x01); + xgifb_reg_or(XGIPART1, IND_XGI_CRT2_WRITE_ENABLE_315, 0x01); xgifb_reg_set(XGIPART1, 0x06, (base & 0xFF)); xgifb_reg_set(XGIPART1, 0x05, ((base >> 8) & 0xFF)); xgifb_reg_set(XGIPART1, 0x04, ((base >> 16) & 0xFF)); @@ -2023,23 +2025,18 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, xgifb_info->chip = XG21; else xgifb_info->chip = XG20; - XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; break; case PCI_DEVICE_ID_XG_40: xgifb_info->chip = XG40; - XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; break; case PCI_DEVICE_ID_XG_41: xgifb_info->chip = XG41; - XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; break; case PCI_DEVICE_ID_XG_42: xgifb_info->chip = XG42; - XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; break; case PCI_DEVICE_ID_XG_27: xgifb_info->chip = XG27; - XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; break; default: ret = -ENODEV; |