patch-2.1.109 linux/drivers/video/skeletonfb.c

• Lines: 69
• Date: Fri Jul 10 15:18:32 1998
• Orig file: v2.1.108/linux/drivers/video/skeletonfb.c
• Orig date: Wed Jun 24 22:54:08 1998

diff -u --recursive --new-file v2.1.108/linux/drivers/video/skeletonfb.c linux/drivers/video/skeletonfb.c
@@ -60,8 +60,7 @@
 
     /*
      *  If your driver supports multiple boards, you should make these arrays,
-     *  or allocate them dynamically (using mem_start for builtin drivers, and
-     *  kmalloc() for loaded modules).
+     *  or allocate them dynamically (using kmalloc()).
      */
 
 static struct xxxfb_info fb_info;
@@ -278,9 +277,8 @@
      *  Initialization
      */
 
-__initfunc(unsigned long xxxfb_init(unsigned long mem_start))
+__initfunc(void xxxfb_init(void))
 {
-    int err;
     struct fb_var_screeninfo var;
 
     fb_info.fbhw = &xxx_switch;
@@ -296,18 +294,15 @@
     /* This should give a reasonable default video mode */
     fbgen_get_var(&disp.var, -1, &fb_info.gen);
     fbgen_do_set_var(var, 1, &fbinfo.gen);
-    err = register_framebuffer(&fb_info.gen.info);
-    if (err < 0)
-	return mem_start;
     fbgen_set_disp(-1, &fb_info.gen.info);
     fbgen_install_cmap(0, &fb_info.gen);
+    if (register_framebuffer(&fb_info.gen.info) < 0)
+	return;
     printk("fb%d: %s frame buffer device\n", GET_FB_IDX(fb_info.node),
 	   fb_info.modename);
 
     /* uncomment this if your driver cannot be unloaded */
     /* MOD_INC_USE_COUNT; */
-
-    return mem_start;
 }
 
 
@@ -344,14 +339,14 @@
      *  Frame buffer operations
      */
 
-static int xxxfb_open(const struct fb_info *info)
+static int xxxfb_open(const struct fb_info *info, int user)
 {
     /* Nothing, only a usage count for the moment */
     MOD_INC_USE_COUNT;
     return 0;
 }
 
-static int xxxfb_release(const struct fb_info *info)
+static int xxxfb_release(const struct fb_info *info, int user)
 {
     MOD_DEC_USE_COUNT;
     return 0;
@@ -379,7 +374,8 @@
 #ifdef MODULE
 int init_module(void)
 {
-    return xxxfb_init(NULL);
+    xxxfb_init();
+    return 0;
 }
 
 void cleanup_module(void)