aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2010-07-13 15:44:05 -0400
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2010-07-23 10:44:52 -0400
commitcd5899551c48dff5fe05914fc187932111091953 (patch)
treea13b7e9dcad42747c237c6fd0a70a64d762b8cd7
parent45f85f4a01b6215a9d75008d0a999cb7795680a3 (diff)
viafb: probe cleanups
viafb: probe cleanups Removal of strange special cases that must not exist as well as a useless check. Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: Joseph Chan <JosephChan@via.com.tw>
-rw-r--r--drivers/video/via/viafbdev.c27
1 files changed, 3 insertions, 24 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 1128d516c8a3..0f56eb28227d 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -1525,10 +1525,6 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
1525 parse_lcd_port(); 1525 parse_lcd_port();
1526 parse_dvi_port(); 1526 parse_dvi_port();
1527 1527
1528 /* for dual-fb must viafb_SAMM_ON=1 and viafb_dual_fb=1 */
1529 if (!viafb_SAMM_ON)
1530 viafb_dual_fb = 0;
1531
1532 viafb_init_chip_info(vdev->chip_type); 1528 viafb_init_chip_info(vdev->chip_type);
1533 /* 1529 /*
1534 * The framebuffer will have been successfully mapped by 1530 * The framebuffer will have been successfully mapped by
@@ -1572,30 +1568,13 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
1572 parse_mode(viafb_mode1, &viafb_second_xres, 1568 parse_mode(viafb_mode1, &viafb_second_xres,
1573 &viafb_second_yres); 1569 &viafb_second_yres);
1574 1570
1575 if (0 == viafb_second_virtual_xres) { 1571 viafb_second_virtual_xres = viafb_second_xres;
1576 switch (viafb_second_xres) { 1572 viafb_second_virtual_yres = viafb_second_yres;
1577 case 1400:
1578 viafb_second_virtual_xres = 1408;
1579 break;
1580 default:
1581 viafb_second_virtual_xres = viafb_second_xres;
1582 break;
1583 }
1584 }
1585 if (0 == viafb_second_virtual_yres)
1586 viafb_second_virtual_yres = viafb_second_yres;
1587 } 1573 }
1588 1574
1589 default_var.xres = default_xres; 1575 default_var.xres = default_xres;
1590 default_var.yres = default_yres; 1576 default_var.yres = default_yres;
1591 switch (default_xres) { 1577 default_var.xres_virtual = default_xres;
1592 case 1400:
1593 default_var.xres_virtual = 1408;
1594 break;
1595 default:
1596 default_var.xres_virtual = default_xres;
1597 break;
1598 }
1599 default_var.yres_virtual = default_yres; 1578 default_var.yres_virtual = default_yres;
1600 default_var.bits_per_pixel = viafb_bpp; 1579 default_var.bits_per_pixel = viafb_bpp;
1601 default_var.pixclock = 1580 default_var.pixclock =