diff options
| author | Aaro Koskinen | 2012-11-04 20:15:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-11-13 21:54:30 +0100 |
| commit | 0904f7f315cc1a3c643b49751147bc5f3c8a22d4 (patch) | |
| tree | 1406905f79e969f2914e799c17e47325919e21fc /drivers/staging/xgifb | |
| parent | staging: xgifb: eliminate pVBInfo->CR6B (diff) | |
| download | kernel-qcow2-linux-0904f7f315cc1a3c643b49751147bc5f3c8a22d4.tar.gz kernel-qcow2-linux-0904f7f315cc1a3c643b49751147bc5f3c8a22d4.tar.xz kernel-qcow2-linux-0904f7f315cc1a3c643b49751147bc5f3c8a22d4.zip | |
staging: xgifb: eliminate pVBInfo->SR16
Inline constant values that are used only once.
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 | 8 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 1 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_struct.h | 1 | ||||
| -rw-r--r-- | drivers/staging/xgifb/vb_table.h | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index ce419d4c950a..213ec1366a9e 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -94,8 +94,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4, 0x18, pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */ xgifb_reg_set(P3c4, 0x19, 0x01); - xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[0]); - xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[1]); + xgifb_reg_set(P3c4, 0x16, 0x03); + xgifb_reg_set(P3c4, 0x16, 0x83); mdelay(1); xgifb_reg_set(P3c4, 0x1B, 0x03); udelay(500); @@ -103,8 +103,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4, 0x18, pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */ xgifb_reg_set(P3c4, 0x19, 0x00); - xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[2]); - xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[3]); + xgifb_reg_set(P3c4, 0x16, 0x03); + xgifb_reg_set(P3c4, 0x16, 0x83); xgifb_reg_set(P3c4, 0x1B, 0x00); } diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index e863ec9f4e08..4d50940899ce 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c @@ -34,7 +34,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo) pVBInfo->SR15 = XGI340_SR13; pVBInfo->CR40 = XGI340_cr41; pVBInfo->AGPReg = XGI340_AGPReg; - pVBInfo->SR16 = XGI340_SR16; /* 310 customization related */ if ((pVBInfo->VBType & VB_SIS301LV) || (pVBInfo->VBType & VB_SIS302LV)) diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h index 2edd0896cf01..407b4a7c1009 100644 --- a/drivers/staging/xgifb/vb_struct.h +++ b/drivers/staging/xgifb/vb_struct.h @@ -162,7 +162,6 @@ struct vb_device_info { unsigned char (*CR40)[8]; unsigned char *AGPReg; - unsigned char *SR16; struct SiS_MCLKData *MCLKData; unsigned char *pXGINew_DRAMTypeDefinition; diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h index 18200eb5fba4..f0fd0ecba155 100644 --- a/drivers/staging/xgifb/vb_table.h +++ b/drivers/staging/xgifb/vb_table.h @@ -120,8 +120,6 @@ static unsigned char XGI340_AGPReg[12] = { 0x00, 0x05, 0xd0, 0x10, 0x10, 0x00 }; -static unsigned char XGI340_SR16[4] = {0x03, 0x83, 0x03, 0x83}; - const struct XGI_ExtStruct XGI330_EModeIDTable[] = { {0x2e, 0x0a1b, 0x0306, 0x06, 0x05, 0x06}, {0x2f, 0x0a1b, 0x0305, 0x05, 0x05, 0x05}, |