]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Staging: xgifb: Remove LCDA detection in xgifb_probe().
authorMiguel Gómez <magomez@igalia.com>
Fri, 6 Jul 2012 10:40:38 +0000 (12:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 11 Jul 2012 23:59:28 +0000 (16:59 -0700)
The piece of code that checks for LCDA in xgifb_probe() just checks for some
register values but doesn't really do anything in response to them (the actions
that should be executed are commented).
As nothing is really being done, the code can be safely removed.

Signed-off-by: Miguel Gómez <magomez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/XGI_main_26.c

index b226458272a3704050a9569932f8e696058a8fd2..0307ecac0ef86a50ece57b7c80bbf183286b02b3 100644 (file)
@@ -1952,36 +1952,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                }
        }
 
-       if ((hw_info->ujVBChipID == VB_CHIP_302B) ||
-                       (hw_info->ujVBChipID == VB_CHIP_301LV) ||
-                       (hw_info->ujVBChipID == VB_CHIP_302LV)) {
-               int tmp;
-               tmp = xgifb_reg_get(XGICR, 0x34);
-               if (tmp <= 0x13) {
-                       /* Currently on LCDA?
-                        *(Some BIOSes leave CR38) */
-                       tmp = xgifb_reg_get(XGICR, 0x38);
-                       if ((tmp & 0x03) == 0x03) {
-                               /* XGI_Pr.XGI_UseLCDA = 1; */
-                       } else {
-                               /* Currently on LCDA?
-                                *(Some newer BIOSes set D0 in CR35) */
-                               tmp = xgifb_reg_get(XGICR, 0x35);
-                               if (tmp & 0x01) {
-                                       /* XGI_Pr.XGI_UseLCDA = 1; */
-                               } else {
-                                       tmp = xgifb_reg_get(XGICR,
-                                                           0x30);
-                                       if (tmp & 0x20) {
-                                               tmp = xgifb_reg_get(
-                                                       XGIPART1, 0x13);
-                                       }
-                               }
-                       }
-               }
-
-       }
-
        xgifb_info->mode_idx = -1;
 
        if (mode)