Skip to content

Commit

Permalink
V4L/DVB (8784): v4l2-dev: make the video_device's release callback ma…
Browse files Browse the repository at this point in the history
…ndatory

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>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Oct 12, 2008
1 parent aa5e90a commit d6e7497
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions drivers/media/video/v4l2-dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit d6e7497

Please sign in to comment.