patch-2.3.14 linux/drivers/video/platinumfb.c

• Lines: 65
• Date: Thu Aug 12 10:22:33 1999
• Orig file: v2.3.13/linux/drivers/video/platinumfb.c
• Orig date: Mon Aug 9 14:59:23 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/video/platinumfb.c linux/drivers/video/platinumfb.c
@@ -156,11 +156,11 @@
  * Interface used by the world
  */
 
-void platinum_init(void);
+int platinum_init(void);
 #ifdef CONFIG_FB_OF
 void platinum_of_init(struct device_node *dp);
 #endif
-void platinum_setup(char *options, int *ints);
+int platinum_setup(char*);
 
 
 static struct fb_ops platinumfb_ops = {
@@ -651,7 +651,7 @@
 	return 1;
 }
 
-void __init platinum_init(void)
+int __init platinum_init(void)
 {
 #ifndef CONFIG_FB_OF
 	struct device_node *dp;
@@ -660,6 +660,7 @@
 	if (dp != 0)
 		platinum_of_init(dp);
 #endif /* CONFIG_FB_OF */
+	return 0;
 }
 
 #ifdef __powerpc__
@@ -676,8 +677,10 @@
 	unsigned long		addr, size;
 	int			i, bank0, bank1, bank2, bank3;
 
-	if(dp->n_addrs != 2)
-		panic("expecting 2 address for platinum (got %d)", dp->n_addrs);
+	if(dp->n_addrs != 2) {
+		printk(KERN_ERR "expecting 2 address for platinum (got %d)", dp->n_addrs);
+		return;
+	}
 
 	info = kmalloc(sizeof(*info), GFP_ATOMIC);
 	if (info == 0)
@@ -854,12 +857,12 @@
 /* 
  * Parse user speficied options (`video=platinumfb:')
  */
-void __init platinum_setup(char *options, int *ints)
+int __init platinum_setup(char *options)
 {
 	char *this_opt;
 
 	if (!options || !*options)
-		return;
+		return 0;
 
 	for (this_opt = strtok(options, ","); this_opt;
 	     this_opt = strtok(NULL, ",")) {
@@ -895,4 +898,5 @@
 			}
 		}
 	}
+	return 0;
 }