patch-2.4.0-test11 linux/drivers/media/video/pms.c

• Lines: 41
• Date: Fri Nov 17 17:56:51 2000
• Orig file: v2.4.0-test10/linux/drivers/media/video/pms.c
• Orig date: Wed Nov 10 13:39:06 1999

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/media/video/pms.c linux/drivers/media/video/pms.c
@@ -681,11 +681,6 @@
 	MOD_DEC_USE_COUNT;
 }
 
-static int pms_init_done(struct video_device *dev)
-{
-	return 0;
-}
-
 static long pms_write(struct video_device *v, const char *buf, unsigned long count, int noblock)
 {
 	return -EINVAL;
@@ -907,20 +902,14 @@
  
 struct video_device pms_template=
 {
-	"Mediavision PMS",
-	VID_TYPE_CAPTURE,
-	VID_HARDWARE_PMS,
-	pms_open,
-	pms_close,
-	pms_read,
-	pms_write,
-	NULL,		/* FIXME - we can use POLL on this board with the irq */
-	pms_ioctl,
-	NULL,
-	pms_init_done,
-	NULL,
-	0,
-	0
+	name:		"Mediavision PMS",
+	type:		VID_TYPE_CAPTURE,
+	hardware:	VID_HARDWARE_PMS,
+	open:		pms_open,
+	close:		pms_close,
+	read:		pms_read,
+	write:		pms_write,
+	ioctl:		pms_ioctl,
 };
 
 struct pms_device pms_device;