[Linux-mips-commits]CVS: linux/drivers/video au1100fb.c,1.1,1.2

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv32576/drivers/video

Modified Files:
	au1100fb.c 
Log Message:
Minor cleanup.


Index: au1100fb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/video/au1100fb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- au1100fb.c	10 Apr 2002 01:10:12 -0000	1.1
+++ au1100fb.c	11 Apr 2002 00:12:57 -0000	1.2
@@ -94,6 +94,8 @@
 static int au1100fb_mmap(struct fb_info *fb, struct file *file, 
 		struct vm_area_struct *vma);
 static int au1100_blank(int blank_mode, struct fb_info_gen *info);
+static int au1100fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
+			  u_long arg, int con, struct fb_info *info);
 
 static struct fb_ops au1100fb_ops = {
 	owner:		THIS_MODULE,
@@ -103,6 +105,7 @@
 	fb_get_cmap:	fbgen_get_cmap,
 	fb_set_cmap:	fbgen_set_cmap,
 	fb_pan_display: fbgen_pan_display,
+        fb_ioctl:       au1100fb_ioctl,
 	fb_mmap:        au1100fb_mmap,
 };
 
@@ -187,9 +190,11 @@
 	    var->yres != p_lcd->yres ||
 	    var->xres != p_lcd->xres ||
 	    var->yres != p_lcd->yres) {
+		printk("bad resolution selected\n");
 		return -EINVAL;
 	}
 	if(var->bits_per_pixel != p_lcd->bpp) {
+		printk("bad bpp\n");
 		return -EINVAL;
 	}
 
@@ -269,6 +274,7 @@
 #ifdef FBCON_HAS_CFB8
 	case 8:
 		/* FIXME */
+		printk("cfb8??\n");
 		break;
 #endif
 #ifdef FBCON_HAS_CFB16
@@ -286,21 +292,22 @@
 static int  au1100_blank(int blank_mode, struct fb_info_gen *_info)
 {
 
-	printk("au1100_blank\n");
-
 	switch (blank_mode) {
 	case VESA_NO_BLANKING:
-		printk("assert go\n");
+		printk("Au1100fb: assert go\n");
 		p_lcd_reg->lcd_control |= LCD_CONTROL_GO;
 		break;
 
 	case VESA_VSYNC_SUSPEND:
 	case VESA_HSYNC_SUSPEND:
 	case VESA_POWERDOWN:
-		printk("deassert go\n");
+		printk("Au1100fb: deassert go\n");
 		p_lcd_reg->lcd_control &= ~LCD_CONTROL_GO;
 		break;
 	default: 
+		printk("Au1100fb: unknown blank mode %d\n",
+				blank_mode);
+		break;
 
 	}
 	return 0;
@@ -374,6 +381,13 @@
 	return 0;
 }
 
+static int au1100fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
+			  u_long arg, int con, struct fb_info *info)
+{
+	/* nothing to do yet */
+	return -EINVAL;
+}
+
 static struct fbgen_hwswitch au1100_switch = {
 	au1100_detect, 
 	au1100_encode_fix, 
@@ -568,20 +582,6 @@
 	}
 }
 
-
-#if 0
-/* If all you need is that - just don't define ->fb_open */
-static int au1100fb_open(const struct fb_info *info, int user)
-{
-	return 0;
-}
-
-/* If all you need is that - just don't define ->fb_release */
-static int au1100fb_release(const struct fb_info *info, int user)
-{
-	return 0;
-}
-#endif
 
 
 #ifdef MODULE