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

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

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/video/sbusfb.c linux/drivers/video/sbusfb.c
@@ -117,11 +117,19 @@
 static void do_install_cmap(int con, struct fb_info *info);
 
 static struct fb_ops sbusfb_ops = {
-	sbusfb_open, sbusfb_release, sbusfb_get_fix, sbusfb_get_var, sbusfb_set_var,
-	sbusfb_get_cmap, sbusfb_set_cmap, sbusfb_pan_display, sbusfb_ioctl, sbusfb_mmap
+	owner:		THIS_MODULE,
+	fb_open:	sbusfb_open,
+	fb_release:	sbusfb_release,
+	fb_get_fix:	sbusfb_get_fix,
+	fb_get_var:	sbusfb_get_var,
+	fb_set_var:	sbusfb_set_var,
+	fb_get_cmap:	sbusfb_get_cmap,
+	fb_set_cmap:	sbusfb_set_cmap,
+	fb_pan_display:	sbusfb_pan_display,
+	fb_ioctl:	sbusfb_ioctl,
+	fb_mmap:	sbusfb_mmap,
 };
 
-
     /*
      *  Open/Release the frame buffer device
      */
@@ -133,13 +141,11 @@
 	if (user) {
 		if (fb->open == 0) {
 			fb->mmaped = 0;
-			fb->open = 1;
 			fb->vtconsole = -1;
 		}
 		fb->open++;
 	} else
 		fb->consolecnt++;
-	MOD_INC_USE_COUNT;
 	return 0;
 }
 
@@ -160,10 +166,8 @@
 			if (fb->reset)
 				fb->reset(fb);
 		}
-		fb->open = 0;
 	} else
 		fb->consolecnt--;
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 

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