staging/xgifb: Remove unnecessary cases in XGINew_SenseLCD

The switch statement sets the temp value to zero for certain cases and
leaves it untouched for other cases -> all these other cases can be
combined in the default case.

Since an empty case containing only a break, it can be removed.

The patch also removes the if statement, as it uses the same value as the switch
for comparison, and includes the code into the switch.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 9caf12a721dfb0a821c2a579c81d1d65fdfbbf09..ab1706b5e98e6bf6eeba7dbb8d3cf8485f98bf03 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1077,44 +1077,23 @@ static unsigned short XGINew_SenseLCD(struct xgi_hw_device_info
                                                        *HwDeviceExtension,
                                      struct vb_device_info *pVBInfo)
 {
-       unsigned short temp;
-
-       /* add lcd sense */
-       if (HwDeviceExtension->ulCRT2LCDType == LCD_UNKNOWN) {
+       unsigned short temp = HwDeviceExtension->ulCRT2LCDType;
+
+       switch (HwDeviceExtension->ulCRT2LCDType) {
+       case LCD_640x480:
+       case LCD_1024x600:
+       case LCD_1152x864:
+       case LCD_1280x960:
+       case LCD_1152x768:
+       case LCD_1920x1440:
+       case LCD_2048x1536:
+               temp = 0; /* overwrite used ulCRT2LCDType */
+               break;
+       case LCD_UNKNOWN: /* unknown lcd, do nothing */
                return 0;
-       } else {
-               temp = (unsigned short) HwDeviceExtension->ulCRT2LCDType;
-               switch (HwDeviceExtension->ulCRT2LCDType) {
-               case LCD_INVALID:
-               case LCD_800x600:
-               case LCD_1024x768:
-               case LCD_1280x1024:
-                       break;
-
-               case LCD_640x480:
-               case LCD_1024x600:
-               case LCD_1152x864:
-               case LCD_1280x960:
-               case LCD_1152x768:
-                       temp = 0;
-                       break;
-
-               case LCD_1400x1050:
-               case LCD_1280x768:
-               case LCD_1600x1200:
-                       break;
-
-               case LCD_1920x1440:
-               case LCD_2048x1536:
-                       temp = 0;
-                       break;
-
-               default:
-                       break;
-               }
-               xgifb_reg_and_or(pVBInfo->P3d4, 0x36, 0xF0, temp);
-               return 1;
        }
+       xgifb_reg_and_or(pVBInfo->P3d4, 0x36, 0xF0, temp);
+       return 1;
 }
 
 static void XGINew_GetXG21Sense(struct pci_dev *pdev,