Move XGI_GetVBType call inside InitTo330Pointer to avoid code duplication. Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx> --- drivers/staging/xgifb/vb_init.c | 4 ---- 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 9e8148f..5f1c41e 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 d46e021..5cf0bd6 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; -- 1.7.10.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
