diff --git a/hw/xfree86/drivers/video/ast/src/ast_driver.c b/hw/xfree86/drivers/video/ast/src/ast_driver.c index 61437b60be..654f0cfd5c 100644 --- a/hw/xfree86/drivers/video/ast/src/ast_driver.c +++ b/hw/xfree86/drivers/video/ast/src/ast_driver.c @@ -276,10 +276,6 @@ ASTProbe(DriverPtr drv, int flags) if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i], ASTPciChipsets, 0, 0, 0, 0, 0))) { - EntityInfoPtr pEnt; - - pEnt = xf86GetEntityInfo(usedChips[i]); - pScrn->driverVersion = AST_VERSION; pScrn->driverName = AST_DRIVER_NAME; pScrn->name = AST_NAME; @@ -1795,7 +1791,6 @@ static XF86AttributeRec ASTAttributes[NUM_ATTRIBUTES] = static void ASTStopVideo(ScrnInfoPtr pScrn, pointer data, Bool exit) { ASTPortPrivPtr pPriv = (ASTPortPrivPtr)data; - ASTPtr pAST = ASTPTR(pScrn); REGION_EMPTY(pScrn->pScreen, &pPriv->clip); diff --git a/hw/xfree86/drivers/video/ast/src/ast_vgatool.c b/hw/xfree86/drivers/video/ast/src/ast_vgatool.c index 47fb42dfa5..dce2fa4c17 100644 --- a/hw/xfree86/drivers/video/ast/src/ast_vgatool.c +++ b/hw/xfree86/drivers/video/ast/src/ast_vgatool.c @@ -1268,10 +1268,6 @@ static ULONG MMCTestSingle2_AST2150(PAST2150DRAMParam param, ULONG datagen) static int CBRTest_AST2150(PAST2150DRAMParam param) { - UCHAR *mmiobase; - - mmiobase = param->pjMMIOVirtualAddress; - if(MMCTestBurst2_AST2150(param, 0) ) return(0); if(MMCTestBurst2_AST2150(param, 1) ) return(0); if(MMCTestBurst2_AST2150(param, 2) ) return(0); @@ -1281,7 +1277,6 @@ static int CBRTest_AST2150(PAST2150DRAMParam param) if(MMCTestBurst2_AST2150(param, 6) ) return(0); if(MMCTestBurst2_AST2150(param, 7) ) return(0); return(1); - } static int CBRScan_AST2150(PAST2150DRAMParam param, int busw) @@ -1750,9 +1745,6 @@ static int MMCTestSingle2(PAST2300DRAMParam param, ULONG datagen) static int CBRTest(PAST2300DRAMParam param) { ULONG data; - UCHAR *mmiobase; - - mmiobase = param->pjMMIOVirtualAddress; data = MMCTestSingle2(param, 0); if((data & 0xff) && (data & 0xff00)) return(0); data |= MMCTestBurst2(param, 00); if((data & 0xff) && (data & 0xff00)) return(0); @@ -1798,9 +1790,6 @@ static int CBRScan(PAST2300DRAMParam param) static ULONG CBRTest2(PAST2300DRAMParam param) { ULONG data; - UCHAR *mmiobase; - - mmiobase = param->pjMMIOVirtualAddress; data = MMCTestBurst2(param, 0); if(data == 0xffff) return(0); data |= MMCTestSingle2(param, 0); if(data == 0xffff) return(0); @@ -1969,7 +1958,7 @@ FINETUNE_DONE: static void finetuneDQSI(PAST2300DRAMParam param) { - ULONG dlli, dqsip, dqidly, cnt; + ULONG dlli, dqsip, dqidly; ULONG reg_mcr18, reg_mcr0c, passcnt[2], diff; ULONG g_dqidly, g_dqsip, g_margin, g_side; unsigned short pass[32][2][2]; @@ -2071,7 +2060,7 @@ static void finetuneDQSI(PAST2300DRAMParam param) static Bool CBRDLL2(PAST2300DRAMParam param) { - ULONG dllmin[2], dllmax[2], dlli, data, data2, passcnt, retry=0; + ULONG dllmin[2], dllmax[2], dlli, data, passcnt, retry=0; UCHAR *mmiobase; BOOL status = FALSE; @@ -2882,7 +2871,7 @@ static void vInitAST2300DRAMReg(ScrnInfoPtr pScrn) { ASTRecPtr pAST = ASTPTR(pScrn); AST2300DRAMParam param; - ULONG i, ulTemp; + ULONG ulTemp; UCHAR jReg; GetIndexRegMask(CRTC_PORT, 0xD0, 0xFF, jReg); @@ -3651,12 +3640,8 @@ I2CReadData(ASTRecPtr pAST) static void I2CDelay(ASTRecPtr pAST) { - ULONG i; - UCHAR jtemp; - - for (i=0;i<150;i++) - jtemp = GetReg(SEQ_PORT); - + for (ULONG i=0;i<150;i++) + GetReg(SEQ_PORT); } static void