xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] v4l2-ctrls/v4l2-events: small coding style cleanups

Browse Source 
Thanks to Laurent Pinchart <laurent.pinchart@ideasonboard.com>.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil
2011-06-20 11:56:24 -03:00
committed by Mauro Carvalho Chehab
parent e969084030
commit 3f66f0ed31
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/v4l2-event.c
View File

@@ -100,10 +100,9 @@ static struct v4l2_subscribed_event *v4l2_event_subscribed(
assert_spin_locked(&fh->vdev->fh_lock); assert_spin_locked(&fh->vdev->fh_lock);
list_for_each_entry(sev, &fh->subscribed, list) { list_for_each_entry(sev, &fh->subscribed, list)
if (sev->type == type && sev->id == id) if (sev->type == type && sev->id == id)
return sev; return sev;
}
return NULL; return NULL;
} }
@@ -169,9 +168,8 @@ void v4l2_event_queue(struct video_device *vdev, const struct v4l2_event *ev)
spin_lock_irqsave(&vdev->fh_lock, flags); spin_lock_irqsave(&vdev->fh_lock, flags);
list_for_each_entry(fh, &vdev->fh_list, list) { list_for_each_entry(fh, &vdev->fh_list, list)
__v4l2_event_queue_fh(fh, ev, &timestamp); __v4l2_event_queue_fh(fh, ev, &timestamp);
}
spin_unlock_irqrestore(&vdev->fh_lock, flags); spin_unlock_irqrestore(&vdev->fh_lock, flags);
} }

1
include/media/v4l2-ctrls.h
View File

@@ -31,7 +31,6 @@ struct v4l2_ctrl_helper;
struct v4l2_ctrl; struct v4l2_ctrl;
struct video_device; struct video_device;
struct v4l2_subdev; struct v4l2_subdev;
struct v4l2_event_subscription;
struct v4l2_subscribed_event; struct v4l2_subscribed_event;
struct v4l2_fh; struct v4l2_fh;

34
include/media/v4l2-event.h
View File

@@ -33,41 +33,45 @@ struct v4l2_fh;
struct v4l2_subscribed_event; struct v4l2_subscribed_event;
struct video_device; struct video_device;
/** struct v4l2_kevent - Internal kernel event struct.
* @list: List node for the v4l2_fh->available list.
* @sev: Pointer to parent v4l2_subscribed_event.
* @event: The event itself.
*/
struct v4l2_kevent { struct v4l2_kevent {
/* list node for the v4l2_fh->available list */
struct list_head list; struct list_head list;
/* pointer to parent v4l2_subscribed_event */
struct v4l2_subscribed_event *sev; struct v4l2_subscribed_event *sev;
/* event itself */
struct v4l2_event event; struct v4l2_event event;
}; };
/** struct v4l2_subscribed_event - Internal struct representing a subscribed event.
* @list: List node for the v4l2_fh->subscribed list.
* @type: Event type.
* @id: Associated object ID (e.g. control ID). 0 if there isn't any.
* @flags: Copy of v4l2_event_subscription->flags.
* @fh: Filehandle that subscribed to this event.
* @node: List node that hooks into the object's event list (if there is one).
* @replace: Optional callback that can replace event 'old' with event 'new'.
* @merge: Optional callback that can merge event 'old' into event 'new'.
* @elems: The number of elements in the events array.
* @first: The index of the events containing the oldest available event.
* @in_use: The number of queued events.
* @events: An array of @elems events.
*/
struct v4l2_subscribed_event { struct v4l2_subscribed_event {
/* list node for the v4l2_fh->subscribed list */
struct list_head list; struct list_head list;
/* event type */
u32 type; u32 type;
/* associated object ID (e.g. control ID) */
u32 id; u32 id;
/* copy of v4l2_event_subscription->flags */
u32 flags; u32 flags;
/* filehandle that subscribed to this event */
struct v4l2_fh *fh; struct v4l2_fh *fh;
/* list node that hooks into the object's event list (if there is one) */
struct list_head node; struct list_head node;
/* Optional callback that can replace event 'old' with event 'new'. */
void (*replace)(struct v4l2_event *old, void (*replace)(struct v4l2_event *old,
const struct v4l2_event *new); const struct v4l2_event *new);
/* Optional callback that can merge event 'old' into event 'new'. */
void (*merge)(const struct v4l2_event *old, void (*merge)(const struct v4l2_event *old,
struct v4l2_event *new); struct v4l2_event *new);
/* the number of elements in the events array */
unsigned elems; unsigned elems;
/* the index of the events containing the oldest available event */
unsigned first; unsigned first;
/* the number of queued events */
unsigned in_use; unsigned in_use;
/* an array of elems events */
struct v4l2_kevent events[]; struct v4l2_kevent events[];
}; };