patch-2.4.0-test2 linux/drivers/video/vfb.c

Next file: linux/drivers/video/vga16fb.c
Previous file: linux/drivers/video/vesafb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/video/vfb.c linux/drivers/video/vfb.c
@@ -80,8 +80,6 @@
 
 int vfb_setup(char*);
 
-static int vfb_open(struct fb_info *info, int user);
-static int vfb_release(struct fb_info *info, int user);
 static int vfb_get_fix(struct fb_fix_screeninfo *fix, int con,
 		       struct fb_info *info);
 static int vfb_get_var(struct fb_var_screeninfo *var, int con,
@@ -124,31 +122,15 @@
 
 
 static struct fb_ops vfb_ops = {
-    vfb_open, vfb_release, vfb_get_fix, vfb_get_var, vfb_set_var, vfb_get_cmap,
-    vfb_set_cmap, vfb_pan_display, vfb_ioctl
+	owner:		THIS_MODULE,
+	fb_get_fix:	vfb_get_fix,
+	fb_get_var:	vfb_get_var,
+	fb_set_var:	vfb_set_var,
+	fb_get_cmap:	vfb_get_cmap,
+	fb_set_cmap:	vfb_set_cmap,
+	fb_pan_display:	vfb_pan_display,
+	fb_ioctl:	vfb_ioctl,
 };
-
-
-    /*
-     *  Open/Release the frame buffer device
-     */
-
-static int vfb_open(struct fb_info *info, int user)
-{
-    /*                                                                     
-     *  Nothing, only a usage count for the moment                          
-     */                                                                    
-
-    MOD_INC_USE_COUNT;
-    return(0);                              
-}
-        
-static int vfb_release(struct fb_info *info, int user)
-{
-    MOD_DEC_USE_COUNT;
-    return(0);                                                    
-}
-
 
     /*
      *  Get the Fixed Part of the Display

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)