renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-11 15:14:03 +08:00
Code

[media] V4L: Merge struct v4l2_async_subdev_list with struct v4l2_subdev

Browse Source 
By integrating the v4l2-async API internals a bit more with
the core overall the v4l2-async code becomes a bit simpler
and easier to follow.
Acked-and-tested-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Sylwester Nawrocki 2013-07-22 08:01:33 -03:00 committed by Mauro Carvalho Chehab
parent e8419d0890
commit b426b3a660
3 changed files with 36 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
drivers/media/v4l2-core/v4l2-async.c
View File

@ -49,12 +49,10 @@ static LIST_HEAD(notifier_list);
static DEFINE_MUTEX(list_lock); static DEFINE_MUTEX(list_lock);
static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier *notifier, static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier *notifier,
struct v4l2_async_subdev_list *asdl) struct v4l2_subdev *sd)
{ {
struct v4l2_subdev *sd = v4l2_async_to_subdev(asdl);
struct v4l2_async_subdev *asd; struct v4l2_async_subdev *asd;
bool (*match)(struct device *, bool (*match)(struct device *, struct v4l2_async_subdev *);
struct v4l2_async_subdev *);
list_for_each_entry(asd, &notifier->waiting, list) { list_for_each_entry(asd, &notifier->waiting, list) {
/* bus_type has been verified valid before */ /* bus_type has been verified valid before */
@ -89,16 +87,15 @@ static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier *
} }
static int v4l2_async_test_notify(struct v4l2_async_notifier *notifier, static int v4l2_async_test_notify(struct v4l2_async_notifier *notifier,
struct v4l2_async_subdev_list *asdl, struct v4l2_subdev *sd,
struct v4l2_async_subdev *asd) struct v4l2_async_subdev *asd)
{ {
struct v4l2_subdev *sd = v4l2_async_to_subdev(asdl);
int ret; int ret;
/* Remove from the waiting list */ /* Remove from the waiting list */
list_del(&asd->list); list_del(&asd->list);
asdl->asd = asd; sd->asd = asd;
asdl->notifier = notifier; sd->notifier = notifier;
if (notifier->bound) { if (notifier->bound) {
ret = notifier->bound(notifier, sd, asd); ret = notifier->bound(notifier, sd, asd);
@ -106,7 +103,7 @@ static int v4l2_async_test_notify(struct v4l2_async_notifier *notifier,
return ret; return ret;
} }
/* Move from the global subdevice list to notifier's done */ /* Move from the global subdevice list to notifier's done */
list_move(&asdl->list, &notifier->done); list_move(&sd->async_list, &notifier->done);
ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd); ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
if (ret < 0) { if (ret < 0) {
@ -121,21 +118,19 @@ static int v4l2_async_test_notify(struct v4l2_async_notifier *notifier,
return 0; return 0;
} }
static void v4l2_async_cleanup(struct v4l2_async_subdev_list *asdl) static void v4l2_async_cleanup(struct v4l2_subdev *sd)
{ {
struct v4l2_subdev *sd = v4l2_async_to_subdev(asdl);
v4l2_device_unregister_subdev(sd); v4l2_device_unregister_subdev(sd);
/* Subdevice driver will reprobe and put asdl back onto the list */ /* Subdevice driver will reprobe and put the subdev back onto the list */
list_del_init(&asdl->list); list_del_init(&sd->async_list);
asdl->asd = NULL; sd->asd = NULL;
sd->dev = NULL; sd->dev = NULL;
} }
int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev, int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
struct v4l2_async_notifier *notifier) struct v4l2_async_notifier *notifier)
{ {
struct v4l2_async_subdev_list *asdl, *tmp; struct v4l2_subdev *sd, *tmp;
struct v4l2_async_subdev *asd; struct v4l2_async_subdev *asd;
int i; int i;
@ -169,14 +164,14 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
/* Keep also completed notifiers on the list */ /* Keep also completed notifiers on the list */
list_add(&notifier->list, &notifier_list); list_add(&notifier->list, &notifier_list);
list_for_each_entry_safe(asdl, tmp, &subdev_list, list) { list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
int ret; int ret;
asd = v4l2_async_belongs(notifier, asdl); asd = v4l2_async_belongs(notifier, sd);
if (!asd) if (!asd)
continue; continue;
ret = v4l2_async_test_notify(notifier, asdl, asd); ret = v4l2_async_test_notify(notifier, sd, asd);
if (ret < 0) { if (ret < 0) {
mutex_unlock(&list_lock); mutex_unlock(&list_lock);
return ret; return ret;
@ -191,7 +186,7 @@ EXPORT_SYMBOL(v4l2_async_notifier_register);
void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier) void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
{ {
struct v4l2_async_subdev_list *asdl, *tmp; struct v4l2_subdev *sd, *tmp;
unsigned int notif_n_subdev = notifier->num_subdevs; unsigned int notif_n_subdev = notifier->num_subdevs;
unsigned int n_subdev = min(notif_n_subdev, V4L2_MAX_SUBDEVS); unsigned int n_subdev = min(notif_n_subdev, V4L2_MAX_SUBDEVS);
struct device *dev[n_subdev]; struct device *dev[n_subdev];
@ -201,18 +196,16 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
list_del(&notifier->list); list_del(&notifier->list);
list_for_each_entry_safe(asdl, tmp, &notifier->done, list) { list_for_each_entry_safe(sd, tmp, &notifier->done, list) {
struct v4l2_subdev *sd = v4l2_async_to_subdev(asdl);
dev[i] = get_device(sd->dev); dev[i] = get_device(sd->dev);
v4l2_async_cleanup(asdl); v4l2_async_cleanup(sd);
/* If we handled USB devices, we'd have to lock the parent too */ /* If we handled USB devices, we'd have to lock the parent too */
device_release_driver(dev[i++]); device_release_driver(dev[i++]);
if (notifier->unbind) if (notifier->unbind)
notifier->unbind(notifier, sd, sd->asdl.asd); notifier->unbind(notifier, sd, sd->asd);
} }
mutex_unlock(&list_lock); mutex_unlock(&list_lock);
@ -241,24 +234,23 @@ EXPORT_SYMBOL(v4l2_async_notifier_unregister);
int v4l2_async_register_subdev(struct v4l2_subdev *sd) int v4l2_async_register_subdev(struct v4l2_subdev *sd)
{ {
struct v4l2_async_subdev_list *asdl = &sd->asdl;
struct v4l2_async_notifier *notifier; struct v4l2_async_notifier *notifier;
mutex_lock(&list_lock); mutex_lock(&list_lock);
INIT_LIST_HEAD(&asdl->list); INIT_LIST_HEAD(&sd->async_list);
list_for_each_entry(notifier, &notifier_list, list) { list_for_each_entry(notifier, &notifier_list, list) {
struct v4l2_async_subdev *asd = v4l2_async_belongs(notifier, asdl); struct v4l2_async_subdev *asd = v4l2_async_belongs(notifier, sd);
if (asd) { if (asd) {
int ret = v4l2_async_test_notify(notifier, asdl, asd); int ret = v4l2_async_test_notify(notifier, sd, asd);
mutex_unlock(&list_lock); mutex_unlock(&list_lock);
return ret; return ret;
} }
} }
/* None matched, wait for hot-plugging */ /* None matched, wait for hot-plugging */
list_add(&asdl->list, &subdev_list); list_add(&sd->async_list, &subdev_list);
mutex_unlock(&list_lock); mutex_unlock(&list_lock);
@ -268,23 +260,22 @@ EXPORT_SYMBOL(v4l2_async_register_subdev);
void v4l2_async_unregister_subdev(struct v4l2_subdev *sd) void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)
{ {
struct v4l2_async_subdev_list *asdl = &sd->asdl; struct v4l2_async_notifier *notifier = sd->notifier;
struct v4l2_async_notifier *notifier = asdl->notifier;
if (!asdl->asd) { if (!sd->asd) {
if (!list_empty(&asdl->list)) if (!list_empty(&sd->async_list))
v4l2_async_cleanup(asdl); v4l2_async_cleanup(sd);
return; return;
} }
mutex_lock(&list_lock); mutex_lock(&list_lock);
list_add(&asdl->asd->list, &notifier->waiting); list_add(&sd->asd->list, &notifier->waiting);
v4l2_async_cleanup(asdl); v4l2_async_cleanup(sd);
if (notifier->unbind) if (notifier->unbind)
notifier->unbind(notifier, sd, sd->asdl.asd); notifier->unbind(notifier, sd, sd->asd);
mutex_unlock(&list_lock); mutex_unlock(&list_lock);
} }

15
include/media/v4l2-async.h
View File

@ -61,26 +61,13 @@ struct v4l2_async_subdev {
struct list_head list; struct list_head list;
}; };
/**
* v4l2_async_subdev_list - provided by subdevices
* @list: links struct v4l2_async_subdev_list objects to a global list
* before probing, and onto notifier->done after probing
* @asd: pointer to respective struct v4l2_async_subdev
* @notifier: pointer to managing notifier
*/
struct v4l2_async_subdev_list {
struct list_head list;
struct v4l2_async_subdev *asd;
struct v4l2_async_notifier *notifier;
};
/** /**
* v4l2_async_notifier - v4l2_device notifier data * v4l2_async_notifier - v4l2_device notifier data
* @num_subdevs:number of subdevices * @num_subdevs:number of subdevices
* @subdevs: array of pointers to subdevice descriptors * @subdevs: array of pointers to subdevice descriptors
* @v4l2_dev: pointer to struct v4l2_device * @v4l2_dev: pointer to struct v4l2_device
* @waiting: list of struct v4l2_async_subdev, waiting for their drivers * @waiting: list of struct v4l2_async_subdev, waiting for their drivers
* @done: list of struct v4l2_async_subdev_list, already probed * @done: list of struct v4l2_subdev, already probed
* @list: member in a global list of notifiers * @list: member in a global list of notifiers
* @bound: a subdevice driver has successfully probed one of subdevices * @bound: a subdevice driver has successfully probed one of subdevices
* @complete: all subdevices have been probed successfully * @complete: all subdevices have been probed successfully

13
include/media/v4l2-subdev.h
View File

@ -586,15 +586,14 @@ struct v4l2_subdev {
struct video_device *devnode; struct video_device *devnode;
/* pointer to the physical device, if any */ /* pointer to the physical device, if any */
struct device *dev; struct device *dev;
struct v4l2_async_subdev_list asdl; /* Links this subdev to a global subdev_list or @notifier->done list. */
struct list_head async_list;
/* Pointer to respective struct v4l2_async_subdev. */
struct v4l2_async_subdev *asd;
/* Pointer to the managing notifier. */
struct v4l2_async_notifier *notifier;
}; };
static inline struct v4l2_subdev *v4l2_async_to_subdev(
struct v4l2_async_subdev_list *asdl)
{
return container_of(asdl, struct v4l2_subdev, asdl);
}
#define media_entity_to_v4l2_subdev(ent) \ #define media_entity_to_v4l2_subdev(ent) \
container_of(ent, struct v4l2_subdev, entity) container_of(ent, struct v4l2_subdev, entity)
#define vdev_to_v4l2_subdev(vdev) \ #define vdev_to_v4l2_subdev(vdev) \