Remove useless easycap_open_noinode() function, and replace it with easycap_open().
Signed-off-by: Ezequiel Garcia <[email protected]> --- Based on 11th patch set (09 Nov) by Tomas Winkler. Changes from v1: This same comment was part of the commit message. --- --- a/drivers/staging/media/easycap/easycap_main.c 2011-11-14 14:05:23.000000000 -0300 +++ b/drivers/staging/media/easycap/easycap_main.c 2011-11-14 14:31:53.000000000 -0300 @@ -133,7 +133,7 @@ return -1; } /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ -static int easycap_open(struct inode *inode, struct file *file) +static int easycap_open(struct file *file) { struct video_device *pvideo_device; struct easycap *peasycap; @@ -678,11 +678,6 @@ /****************************************************************************/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ /*--------------------------------------------------------------------------*/ -static int easycap_open_noinode(struct file *file) -{ - return easycap_open(NULL, file); -} - static int videodev_release(struct video_device *pvideo_device) { struct easycap *peasycap; @@ -2844,7 +2839,7 @@ static const struct v4l2_file_operations v4l2_fops = { .owner = THIS_MODULE, - .open = easycap_open_noinode, + .open = easycap_open, .unlocked_ioctl = easycap_unlocked_ioctl, .poll = easycap_poll, .mmap = easycap_mmap, _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
