Commit d6e7497e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8784): v4l2-dev: make the video_device's release callback mandatory 



Now that all drivers set the release callback in the video_device
struct we can put in a BUG_ON in video_register_device to ensure that
the callback is always there.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aa5e90af

drivers/media/video/v4l2-dev.c

+2 −14
Original line number Diff line number Diff line
@@ -84,11 +84,6 @@ static void video_release(struct device *cd) 
{

	struct video_device *vfd = container_of(cd, struct video_device, dev);



#if 1

	/* needed until all drivers are fixed */

	if (!vfd->release)

		return;

#endif

	vfd->release(vfd);

}
@@ -233,8 +228,8 @@ int video_register_device_index(struct video_device *vfd, int type, int nr, 
	int ret;

	char *name_base;



	if (vfd == NULL)

		return -EINVAL;

	/* the release callback MUST be present */

	BUG_ON(!vfd->release);



	if (vfd == NULL)

		return -EINVAL;
@@ -312,13 +307,6 @@ int video_register_device_index(struct video_device *vfd, int type, int nr, 
		goto fail_minor;

	}



#if 1

	/* needed until all drivers are fixed */

	if (!vfd->release)

		printk(KERN_WARNING "videodev: \"%s\" has no release callback. "

		       "Please fix your driver for proper sysfs support, see "

		       "http://lwn.net/Articles/36850/\n", vfd->name);

#endif

	return 0;



fail_minor: