video: fbdev: radeon: Remove dead code

[platform/kernel/linux-starfive.git] / drivers / video / fbdev / aty / radeon_base.c

diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c
index 3af00e3..e116a3f 100644 (file)
--- a/drivers/video/fbdev/aty/radeon_base.c
+++ b/drivers/video/fbdev/aty/radeon_base.c
@@ -849,12 +849,6 @@ static int radeonfb_check_var (struct fb_var_screeninfo *var, struct fb_info *in
                case 9 ... 16:
                        v.bits_per_pixel = 16;
                        break;
-               case 17 ... 24:
-#if 0 /* Doesn't seem to work */
-                       v.bits_per_pixel = 24;
-                       break;
-#endif                 
-                       return -EINVAL;
                case 25 ... 32:
                        v.bits_per_pixel = 32;
                        break;
@@ -1650,14 +1644,14 @@ static int radeonfb_set_par(struct fb_info *info)
        struct fb_var_screeninfo *mode = &info->var;
        struct radeon_regs *newmode;
        int hTotal, vTotal, hSyncStart, hSyncEnd,
-           hSyncPol, vSyncStart, vSyncEnd, vSyncPol, cSync;
+           vSyncStart, vSyncEnd;
        u8 hsync_adj_tab[] = {0, 0x12, 9, 9, 6, 5};
        u8 hsync_fudge_fp[] = {2, 2, 0, 0, 5, 5};
        u32 sync, h_sync_pol, v_sync_pol, dotClock, pixClock;
        int i, freq;
        int format = 0;
        int nopllcalc = 0;
-       int hsync_start, hsync_fudge, bytpp, hsync_wid, vsync_wid;
+       int hsync_start, hsync_fudge, hsync_wid, vsync_wid;
        int primary_mon = PRIMARY_MONITOR(rinfo);
        int depth = var_to_depth(mode);
        int use_rmx = 0;
@@ -1730,13 +1724,7 @@ static int radeonfb_set_par(struct fb_info *info)
        else if (vsync_wid > 0x1f)      /* max */
                vsync_wid = 0x1f;
 
-       hSyncPol = mode->sync & FB_SYNC_HOR_HIGH_ACT ? 0 : 1;
-       vSyncPol = mode->sync & FB_SYNC_VERT_HIGH_ACT ? 0 : 1;
-
-       cSync = mode->sync & FB_SYNC_COMP_HIGH_ACT ? (1 << 4) : 0;
-
        format = radeon_get_dstbpp(depth);
-       bytpp = mode->bits_per_pixel >> 3;
 
        if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD))
                hsync_fudge = hsync_fudge_fp[format-1];
@@ -2548,16 +2536,6 @@ static void radeonfb_pci_unregister(struct pci_dev *pdev)
        if (rinfo->mon2_EDID)
                sysfs_remove_bin_file(&rinfo->pdev->dev.kobj, &edid2_attr);
 
-#if 0
-       /* restore original state
-        * 
-        * Doesn't quite work yet, I suspect if we come from a legacy
-        * VGA mode (or worse, text mode), we need to do some VGA black
-        * magic here that I know nothing about. --BenH
-        */
-        radeon_write_mode (rinfo, &rinfo->init_state, 1);
- #endif
-
        del_timer_sync(&rinfo->lvds_timer);
        arch_phys_wc_del(rinfo->wc_cookie);
         unregister_framebuffer(info);