lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil
2008-08-23 06:27:59 -03:00
committed by Mauro Carvalho Chehab
parent aa5e90af7d
commit d6e7497eaf
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/video/v4l2-dev.c
View File

@@ -84,11 +84,6 @@ static void video_release(struct device *cd)
{ {
struct video_device *vfd = container_of(cd, struct video_device, dev); 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); vfd->release(vfd);
} }
@@ -233,8 +228,8 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
int ret; int ret;
char *name_base; char *name_base;
if (vfd == NULL) /* the release callback MUST be present */
return -EINVAL; BUG_ON(!vfd->release);
if (vfd == NULL) if (vfd == NULL)
return -EINVAL; return -EINVAL;
@@ -312,13 +307,6 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
goto fail_minor; 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; return 0;
fail_minor: fail_minor: