5 files changed, 1 insertions, 62 deletions

diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index 8cd279be74e5..37624f74e88b 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -329,12 +329,6 @@ extern unsigned char fontdata_8x16[];
  *
  *      * perform fb specific mmap *
  *      int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma);
- *
- *      * save current hardware state *
- *      void (*fb_save_state)(struct fb_info *info);
- *
- *      * restore saved state *
- *      void (*fb_restore_state)(struct fb_info *info);
  * } ;
  */
 
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 5a686cea23f4..3681c6a88212 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2311,14 +2311,11 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
                 ops->graphics = 1;
 
                 if (!blank) {
-                        if (info->fbops->fb_save_state)
-                                info->fbops->fb_save_state(info);
                         var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE;
                         fb_set_var(info, &var);
                         ops->graphics = 0;
                         ops->var = info->var;
-                } else if (info->fbops->fb_restore_state)
-                        info->fbops->fb_restore_state(info);
+                }
         }
 
         if (!fbcon_is_inactive(vc, info)) {
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 37b135d5d12e..0857b3b8c495 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -1606,22 +1606,6 @@ static int savagefb_blank(int blank, struct fb_info *info)
         return (blank == FB_BLANK_NORMAL) ? 1 : 0;
 }
 
-static void savagefb_save_state(struct fb_info *info)
-{
-        struct savagefb_par *par = info->par;
-
-        savage_get_default_par(par, &par->save);
-}
-
-static void savagefb_restore_state(struct fb_info *info)
-{
-        struct savagefb_par *par = info->par;
-
-        savagefb_blank(FB_BLANK_POWERDOWN, info);
-        savage_set_default_par(par, &par->save);
-        savagefb_blank(FB_BLANK_UNBLANK, info);
-}
-
 static int savagefb_open(struct fb_info *info, int user)
 {
         struct savagefb_par *par = info->par;
@@ -1667,8 +1651,6 @@ static struct fb_ops savagefb_ops = {
         .fb_setcolreg   = savagefb_setcolreg,
         .fb_pan_display = savagefb_pan_display,
         .fb_blank       = savagefb_blank,
-        .fb_save_state  = savagefb_save_state,
-        .fb_restore_state = savagefb_restore_state,
 #if defined(CONFIG_FB_SAVAGE_ACCEL)
         .fb_fillrect    = savagefb_fillrect,
         .fb_copyarea    = savagefb_copyarea,
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index e35232a18571..54fbb2995a5f 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -1411,23 +1411,6 @@ static int uvesafb_check_var(struct fb_var_screeninfo *var,
         return 0;
 }
 
-static void uvesafb_save_state(struct fb_info *info)
-{
-        struct uvesafb_par *par = info->par;
-
-        if (par->vbe_state_saved)
-                kfree(par->vbe_state_saved);
-
-        par->vbe_state_saved = uvesafb_vbe_state_save(par);
-}
-
-static void uvesafb_restore_state(struct fb_info *info)
-{
-        struct uvesafb_par *par = info->par;
-
-        uvesafb_vbe_state_restore(par, par->vbe_state_saved);
-}
-
 static struct fb_ops uvesafb_ops = {
         .owner          = THIS_MODULE,
         .fb_open        = uvesafb_open,
@@ -1441,8 +1424,6 @@ static struct fb_ops uvesafb_ops = {
         .fb_imageblit   = cfb_imageblit,
         .fb_check_var   = uvesafb_check_var,
         .fb_set_par     = uvesafb_set_par,
-        .fb_save_state  = uvesafb_save_state,
-        .fb_restore_state = uvesafb_restore_state,
 };
 
 static void __devinit uvesafb_init_info(struct fb_info *info,
@@ -1459,15 +1440,6 @@ static void __devinit uvesafb_init_info(struct fb_info *info,
         info->fix.ypanstep = par->ypan ? 1 : 0;
         info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
 
-        /*
-         * If we were unable to get the state buffer size, disable
-         * functions for saving and restoring the hardware state.
-         */
-        if (par->vbe_state_size == 0) {
-                info->fbops->fb_save_state = NULL;
-                info->fbops->fb_restore_state = NULL;
-        }
-
         /* Disable blanking if the user requested so. */
         if (!blank)
                 info->fbops->fb_blank = NULL;
diff --git a/include/linux/fb.h b/include/linux/fb.h
index a34bdf5a9d23..de9c722e7b90 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -669,12 +669,6 @@ struct fb_ops {
         /* perform fb specific mmap */
         int (*fb_mmap)(struct fb_info *info, struct vm_area_struct *vma);
 
-        /* save current hardware state */
-        void (*fb_save_state)(struct fb_info *info);
-
-        /* restore saved state */
-        void (*fb_restore_state)(struct fb_info *info);
-
         /* get capability given var */
         void (*fb_get_caps)(struct fb_info *info, struct fb_blit_caps *caps,
                             struct fb_var_screeninfo *var);