diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-05-29 23:59:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 20:55:47 +0900 |
| commit | ce76de5abe223ea307536061f1a13932a61404f1 (patch) | |
| tree | 1e26d4eebeae8b137717b95cfb607ef971a082e6 /drivers/staging/xgifb | |
| parent | 4b8071121dfc7703c9b0bf5e2e66d0bbe7e24990 (diff) | |
staging: xgifb: call XGI_GetVBType from InitTo330Pointer
Move XGI_GetVBType call inside InitTo330Pointer to avoid code duplication.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/vb_init.c | 4 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 9e8148f12dd2..5f1c41ed778b 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -1212,10 +1212,6 @@ unsigned char XGIInitNew(struct pci_dev *pdev) outb(0x67, pVBInfo->P3c2); - if (HwDeviceExtension->jChipType < XG20) - /* Run XGI_GetVBType before InitTo330Pointer */ - XGI_GetVBType(pVBInfo); - InitTo330Pointer(HwDeviceExtension->jChipType, pVBInfo); /* Openkey */ diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index d46e021e7f26..5cf0bd65f85a 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -35,6 +35,9 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) pVBInfo->SR18 = XGI340_SR18; pVBInfo->CR40 = XGI340_cr41; + if (ChipType < XG20) + XGI_GetVBType(pVBInfo); + /* 310 customization related */ if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV)) pVBInfo->LCDCapList = XGI_LCDDLCapList; @@ -5734,9 +5737,6 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info, } } - if (HwDeviceExtension->jChipType < XG20) - XGI_GetVBType(pVBInfo); - InitTo330Pointer(HwDeviceExtension->jChipType, pVBInfo); if (ModeNo & 0x80) ModeNo = ModeNo & 0x7F; |