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

Next file: linux/drivers/media/video/pms.c
Previous file: linux/drivers/media/video/msp3400.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/media/video/planb.c linux/drivers/media/video/planb.c
@@ -2035,31 +2035,17 @@
 	return 0;
 }
 
-/* This gets called upon device registration */
-/* we could do some init here */
-static int planb_init_done(struct video_device *dev)
-{
-	return 0;
-}
-
 static struct video_device planb_template=
 {
-	PLANB_DEVICE_NAME,
-	VID_TYPE_OVERLAY,
-	VID_HARDWARE_PLANB,
-	planb_open,
-	planb_close,
-	planb_read,
-	planb_write,
-#if LINUX_VERSION_CODE >= 0x020100
-	NULL,	/* poll */
-#endif
-	planb_ioctl,
-	planb_mmap,	/* mmap? */
-	planb_init_done,
-	NULL,	/* pointer to private data */
-	0,
-	0
+	name:		PLANB_DEVICE_NAME,
+	type:		VID_TYPE_OVERLAY,
+	hardware:	VID_HARDWARE_PLANB,
+	open:		planb_open,
+	close:		planb_close,
+	read:		planb_read,
+	write:		planb_write,
+	ioctl:		planb_ioctl,
+	mmap:		planb_mmap,	/* mmap? */
 };
 
 static int init_planb(struct planb *pb)

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