From 6a7fd2db79ab619cecb803619f8077956ec124cc Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Tue, 5 Feb 2013 22:32:33 +0100 Subject: [PATCH] staging/xgifb: Remove unneeded conditional assignment pVBInfo->ram_type is assigned the return value of XGINew_GetXG20DRAMType which can only be 0, 1 or 2 -> The conditional assignment is not needed here as it always evaluates to true. -> remove Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman --- drivers/staging/xgifb/vb_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c index 7b8f41d0ad7c..e19a714d2193 100644 --- a/drivers/staging/xgifb/vb_init.c +++ b/drivers/staging/xgifb/vb_init.c @@ -440,7 +440,7 @@ static void XGINew_SetDRAMDefaultRegister340( xgifb_reg_set(P3d4, 0x6A, pVBInfo->CR40[7][pVBInfo->ram_type]); /* CR6B DQS fine tune delay */ - temp = (pVBInfo->ram_type <= 2) ? 0xaa : 0x00; + temp = 0xaa; XGI_SetDRAM_Helper(P3d4, temp, 0, 0x6B, 2, 0xF0, 0x10); /* CR6E DQM fine tune delay */ -- 2.20.1