Skip to content

Commit

Permalink
V4L/DVB (8781): v4l2-dev: remove obsolete video_exclusive_open/release
Browse files Browse the repository at this point in the history
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 7d43cd5 commit cb35358
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 36 deletions.
30 changes: 0 additions & 30 deletions drivers/media/video/v4l2-dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,34 +141,6 @@ static int video_open(struct inode *inode, struct file *file)
return err;
}

/*
* open/release helper functions -- handle exclusive opens
* Should be removed soon
*/
int video_exclusive_open(struct inode *inode, struct file *file)
{
struct video_device *vfl = video_devdata(file);
int retval = 0;

mutex_lock(&vfl->lock);
if (vfl->users)
retval = -EBUSY;
else
vfl->users++;
mutex_unlock(&vfl->lock);
return retval;
}
EXPORT_SYMBOL(video_exclusive_open);

int video_exclusive_release(struct inode *inode, struct file *file)
{
struct video_device *vfl = video_devdata(file);

vfl->users--;
return 0;
}
EXPORT_SYMBOL(video_exclusive_release);

/**
* get_index - assign stream number based on parent device
* @vdev: video_device to assign index number to, vdev->dev should be assigned
Expand Down Expand Up @@ -320,8 +292,6 @@ int video_register_device_index(struct video_device *vfd, int type, int nr,
goto fail_minor;
}

mutex_init(&vfd->lock);

/* sysfs class */
memset(&vfd->dev, 0x00, sizeof(vfd->dev));
vfd->dev.class = &video_class;
Expand Down
6 changes: 0 additions & 6 deletions include/media/v4l2-dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ struct video_device
* Or use {pci|usb}_{get|set}_drvdata() directly. */
void *priv;
#endif

/* for videodev.c internal usage -- please don't touch */
int users; /* video_exclusive_{open|close} ... */
struct mutex lock; /* ... helper function uses these */
};

/* Class-dev to video-device */
Expand Down Expand Up @@ -111,8 +107,6 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)

/* Obsolete stuff - Still needed for radio devices and obsolete drivers */
extern struct video_device* video_devdata(struct file*);
extern int video_exclusive_open(struct inode *inode, struct file *file);
extern int video_exclusive_release(struct inode *inode, struct file *file);
#endif

#endif /* _V4L2_DEV_H */

0 comments on commit cb35358

Please sign in to comment.