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

• Lines: 49
• Date: Tue Jun 20 14:14:51 2000
• Orig file: v2.4.0-test1/linux/drivers/video/S3triofb.c
• Orig date: Thu Aug 26 13:05:40 1999

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/video/S3triofb.c linux/drivers/video/S3triofb.c
@@ -77,8 +77,6 @@
      *  Interface used by the world
      */
 
-static int s3trio_open(struct fb_info *info, int user);
-static int s3trio_release(struct fb_info *info, int user);
 static int s3trio_get_fix(struct fb_fix_screeninfo *fix, int con,
 			  struct fb_info *info);
 static int s3trio_get_var(struct fb_var_screeninfo *var, int con,
@@ -141,31 +139,15 @@
 
 
 static struct fb_ops s3trio_ops = {
-    s3trio_open, s3trio_release, s3trio_get_fix, s3trio_get_var, s3trio_set_var,
-    s3trio_get_cmap, s3trio_set_cmap, s3trio_pan_display, s3trio_ioctl
+	owner:		THIS_MODULE,
+	fb_get_fix:	s3trio_get_fix,
+	fb_get_var:	s3trio_get_var,
+	fb_set_var:	s3trio_set_var,
+	fb_get_cmap:	s3trio_get_cmap,
+	fb_set_cmap:	s3trio_set_cmap,
+	fb_pan_display:	s3trio_pan_display,
+	fb_ioctl:	s3trio_ioctl,
 };
-
-
-    /*
-     *  Open/Release the frame buffer device
-     */
-
-static int s3trio_open(struct fb_info *info, int user)
-{
-    /*
-     *  Nothing, only a usage count for the moment
-     */
-
-    MOD_INC_USE_COUNT;
-    return(0);
-}
-
-static int s3trio_release(struct fb_info *info, int user)
-{
-    MOD_DEC_USE_COUNT;
-    return(0);
-}
-
 
     /*
      *  Get the Fixed Part of the Display