mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-29 10:01:25 +00:00
V4L/DVB (13552): v4l: Replace video_is_unregistered with video_is_registered
Replace the video_is_unregistered function by a video_is_registered function. The V4L2_FL_UNREGISTERED flag is replaced by a V4L2_FL_REGISTERED flag. This change makes the video_is_registered function return coherent results when called on an initialize but not yet registered video_device instance. The function can now be used instead of checking video_device::minor. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
0fda5d4420
commit
957b4aa9f7
3 changed files with 18 additions and 20 deletions
|
@ -28,10 +28,10 @@ struct v4l2_ioctl_callbacks;
|
|||
struct video_device;
|
||||
struct v4l2_device;
|
||||
|
||||
/* Flag to mark the video_device struct as unregistered.
|
||||
Drivers can set this flag if they want to block all future
|
||||
device access. It is set by video_unregister_device. */
|
||||
#define V4L2_FL_UNREGISTERED (0)
|
||||
/* Flag to mark the video_device struct as registered.
|
||||
Drivers can clear this flag if they want to block all future
|
||||
device access. It is cleared by video_unregister_device. */
|
||||
#define V4L2_FL_REGISTERED (0)
|
||||
|
||||
struct v4l2_file_operations {
|
||||
struct module *owner;
|
||||
|
@ -96,9 +96,7 @@ struct video_device
|
|||
/* Register video devices. Note that if video_register_device fails,
|
||||
the release() callback of the video_device structure is *not* called, so
|
||||
the caller is responsible for freeing any data. Usually that means that
|
||||
you call video_device_release() on failure.
|
||||
|
||||
Also note that vdev->minor is set to -1 if the registration failed. */
|
||||
you call video_device_release() on failure. */
|
||||
int __must_check video_register_device(struct video_device *vdev, int type, int nr);
|
||||
|
||||
/* Same as video_register_device, but no warning is issued if the desired
|
||||
|
@ -106,7 +104,7 @@ int __must_check video_register_device(struct video_device *vdev, int type, int
|
|||
int __must_check video_register_device_no_warn(struct video_device *vdev, int type, int nr);
|
||||
|
||||
/* Unregister video devices. Will do nothing if vdev == NULL or
|
||||
vdev->minor < 0. */
|
||||
video_is_registered() returns false. */
|
||||
void video_unregister_device(struct video_device *vdev);
|
||||
|
||||
/* helper functions to alloc/release struct video_device, the
|
||||
|
@ -146,9 +144,9 @@ static inline const char *video_device_node_name(struct video_device *vdev)
|
|||
return dev_name(&vdev->dev);
|
||||
}
|
||||
|
||||
static inline int video_is_unregistered(struct video_device *vdev)
|
||||
static inline int video_is_registered(struct video_device *vdev)
|
||||
{
|
||||
return test_bit(V4L2_FL_UNREGISTERED, &vdev->flags);
|
||||
return test_bit(V4L2_FL_REGISTERED, &vdev->flags);
|
||||
}
|
||||
|
||||
#endif /* _V4L2_DEV_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue