redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: xgifb: remove unnecessary else 

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
wifi-calibration
Thomas Gummerer 2014-09-05 17:09:34 +02:00 committed by Greg Kroah-Hartman
parent 588a12d789
commit 9c8c831514
3 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/xgifb/XGI_main_26.c
View File

@ -588,13 +588,11 @@ static u8 XGIfb_search_refresh_rate(struct xgifb_video_info *xgifb_info,
} }
i++; i++;
} }
if (xgifb_info->rate_idx > 0) { if (xgifb_info->rate_idx > 0)
return xgifb_info->rate_idx; return xgifb_info->rate_idx;
} else {
pr_info("Unsupported rate %d for %dx%d\n", pr_info("Unsupported rate %d for %dx%d\n",
rate, xres, yres); rate, xres, yres);
return 0; return 0;
}
} }
static void XGIfb_search_tvstd(const char *name) static void XGIfb_search_tvstd(const char *name)

18
drivers/staging/xgifb/vb_init.c
View File

@ -63,14 +63,13 @@ XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension,
/* ~HOTPLUG_SUPPORT */ /* ~HOTPLUG_SUPPORT */
xgifb_reg_or(pVBInfo->P3d4, 0xB4, 0x02); xgifb_reg_or(pVBInfo->P3d4, 0xB4, 0x02);
return data; return data;
} else { }
data = xgifb_reg_get(pVBInfo->P3d4, 0x97) & 0x01; data = xgifb_reg_get(pVBInfo->P3d4, 0x97) & 0x01;
if (data == 1) if (data == 1)
data++; data++;
return data; return data;
}
} }
static void XGINew_DDR1x_MRS_340(unsigned long P3c4, static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
@ -578,9 +577,8 @@ static unsigned char XGINew_CheckFrequence(struct vb_device_info *pVBInfo)
data = xgifb_reg_get(pVBInfo->P3c4, 0x39); data = xgifb_reg_get(pVBInfo->P3c4, 0x39);
data = (data & 0x02) >> 1; data = (data & 0x02) >> 1;
return data; return data;
} else {
return data & 0x01;
} }
return data & 0x01;
} }
static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension, static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
@ -637,7 +635,6 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
if (XGINew_ReadWriteRest(23, 22, pVBInfo) == 1) if (XGINew_ReadWriteRest(23, 22, pVBInfo) == 1)
return; return;
else
xgifb_reg_set(pVBInfo->P3c4, xgifb_reg_set(pVBInfo->P3c4,
0x13, 0x13,
0x31); 0x31);
@ -687,7 +684,8 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
if (XGINew_ReadWriteRest(22, 21, pVBInfo) == 1) if (XGINew_ReadWriteRest(22, 21, pVBInfo) == 1)
return; return;
else /* (0x31:12x8x2) 22bit + 1 rank */
/* (0x31:12x8x2) 22bit + 1 rank */
xgifb_reg_set(pVBInfo->P3c4, xgifb_reg_set(pVBInfo->P3c4,
0x13, 0x13,
0x31); 0x31);
@ -729,10 +727,8 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
if (XGINew_ReadWriteRest(23, 22, pVBInfo) == 1) if (XGINew_ReadWriteRest(23, 22, pVBInfo) == 1)
return; return;
else {
xgifb_reg_set(pVBInfo->P3c4, 0x13, 0x21); xgifb_reg_set(pVBInfo->P3c4, 0x13, 0x21);
xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x30); xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x30);
}
} else { /* DDR */ } else { /* DDR */
pVBInfo->ram_bus = 64; /* 64 bits */ pVBInfo->ram_bus = 64; /* 64 bits */
pVBInfo->ram_channel = 1; /* 1 channels */ pVBInfo->ram_channel = 1; /* 1 channels */
@ -741,11 +737,9 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
if (XGINew_ReadWriteRest(24, 23, pVBInfo) == 1) if (XGINew_ReadWriteRest(24, 23, pVBInfo) == 1)
return; return;
else {
xgifb_reg_set(pVBInfo->P3c4, 0x13, 0x21); xgifb_reg_set(pVBInfo->P3c4, 0x13, 0x21);
xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x42); xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x42);
} }
}
break; break;
@ -781,13 +775,11 @@ static void XGINew_CheckChannel(struct xgi_hw_device_info *HwDeviceExtension,
xgifb_reg_set(pVBInfo->P3c4, 0x13, 0xA1); xgifb_reg_set(pVBInfo->P3c4, 0x13, 0xA1);
xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x5A); xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x5A);
if (XGINew_ReadWriteRest(25, 24, pVBInfo) == 1) { if (XGINew_ReadWriteRest(25, 24, pVBInfo) == 1)
return; return;
} else {
xgifb_reg_set(pVBInfo->P3c4, 0x13, 0x21); xgifb_reg_set(pVBInfo->P3c4, 0x13, 0x21);
xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x4A); xgifb_reg_set(pVBInfo->P3c4, 0x14, 0x4A);
} }
}
break; break;
} }
} }

1
drivers/staging/xgifb/vb_setmode.c
View File

@ -3895,7 +3895,6 @@ static struct XGI301C_Tap4TimingStruct const
if (tempax <= tempbx) if (tempax <= tempbx)
return &xgifb_tap4_timing[0]; return &xgifb_tap4_timing[0];
else
Tap4TimingPtr = xgifb_ntsc_525_tap4_timing; /* NTSC */ Tap4TimingPtr = xgifb_ntsc_525_tap4_timing; /* NTSC */
if (pVBInfo->TVInfo & TVSetPAL) if (pVBInfo->TVInfo & TVSetPAL)