Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: v4l2: async: Remove notifier subdevs array

Browse Source 
All platform drivers have been converted to use
v4l2_async_notifier_add_subdev(), in place of adding
asd's to the notifier subdevs array. So the subdevs
array can now be removed from struct v4l2_async_notifier,
and remove the backward compatibility support for that
array in v4l2-async.c.

Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Steve Longerbeam 2018-09-29 15:54:19 -04:00 committed by Mauro Carvalho Chehab
parent d079f94c90
commit 66beb323e4
3 changed files with 30 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,32 +359,24 @@ __v4l2_async_notifier_has_async_subdev(struct v4l2_async_notifier *notifier,
/*
* Find out whether an async sub-device was set up already or
* whether it exists in a given notifier before @this_index.
* If @this_index < 0, search the notifier's entire @asd_list.
*/
static bool
v4l2_async_notifier_has_async_subdev(struct v4l2_async_notifier *notifier,
struct v4l2_async_subdev *asd,
unsigned int this_index)
int this_index)
{
struct v4l2_async_subdev *asd_y;
unsigned int j;
int j = 0;
lockdep_assert_held(&list_lock);
/* Check that an asd is not being added more than once. */
if (notifier->subdevs) {
for (j = 0; j < this_index; j++) {
asd_y = notifier->subdevs[j];
if (asd_equal(asd, asd_y))
return true;
}
} else {
j = 0;
list_for_each_entry(asd_y, &notifier->asd_list, asd_list) {
if (j++ >= this_index)
break;
if (asd_equal(asd, asd_y))
return true;
}
list_for_each_entry(asd_y, &notifier->asd_list, asd_list) {
if (this_index >= 0 && j++ >= this_index)
break;
if (asd_equal(asd, asd_y))
return true;
}
/* Check that an asd does not exist in other notifiers. */
@ -397,7 +389,7 @@ v4l2_async_notifier_has_async_subdev(struct v4l2_async_notifier *notifier,
static int v4l2_async_notifier_asd_valid(struct v4l2_async_notifier *notifier,
struct v4l2_async_subdev *asd,
unsigned int this_index)
int this_index)
{
struct device *dev =
notifier->v4l2_dev ? notifier->v4l2_dev->dev : NULL;
@ -438,36 +430,19 @@ EXPORT_SYMBOL(v4l2_async_notifier_init);
static int __v4l2_async_notifier_register(struct v4l2_async_notifier *notifier)
{
struct v4l2_async_subdev *asd;
int ret;
int i;
if (notifier->num_subdevs > V4L2_MAX_SUBDEVS)
return -EINVAL;
int ret, i = 0;
INIT_LIST_HEAD(&notifier->waiting);
INIT_LIST_HEAD(&notifier->done);
mutex_lock(&list_lock);
if (notifier->subdevs) {
for (i = 0; i < notifier->num_subdevs; i++) {
asd = notifier->subdevs[i];
list_for_each_entry(asd, &notifier->asd_list, asd_list) {
ret = v4l2_async_notifier_asd_valid(notifier, asd, i++);
if (ret)
goto err_unlock;
ret = v4l2_async_notifier_asd_valid(notifier, asd, i);
if (ret)
goto err_unlock;
list_add_tail(&asd->list, &notifier->waiting);
}
} else {
i = 0;
list_for_each_entry(asd, &notifier->asd_list, asd_list) {
ret = v4l2_async_notifier_asd_valid(notifier, asd, i++);
if (ret)
goto err_unlock;
list_add_tail(&asd->list, &notifier->waiting);
}
list_add_tail(&asd->list, &notifier->waiting);
}
ret = v4l2_async_notifier_try_all_subdevs(notifier);
@ -560,45 +535,22 @@ EXPORT_SYMBOL(v4l2_async_notifier_unregister);
static void __v4l2_async_notifier_cleanup(struct v4l2_async_notifier *notifier)
{
struct v4l2_async_subdev *asd, *tmp;
unsigned int i;
if (!notifier)
return;
if (notifier->subdevs) {
for (i = 0; i < notifier->num_subdevs; i++) {
asd = notifier->subdevs[i];
switch (asd->match_type) {
case V4L2_ASYNC_MATCH_FWNODE:
fwnode_handle_put(asd->match.fwnode);
break;
default:
break;
}
kfree(asd);
list_for_each_entry_safe(asd, tmp, &notifier->asd_list, asd_list) {
switch (asd->match_type) {
case V4L2_ASYNC_MATCH_FWNODE:
fwnode_handle_put(asd->match.fwnode);
break;
default:
break;
}
kvfree(notifier->subdevs);
notifier->subdevs = NULL;
} else {
list_for_each_entry_safe(asd, tmp,
&notifier->asd_list, asd_list) {
switch (asd->match_type) {
case V4L2_ASYNC_MATCH_FWNODE:
fwnode_handle_put(asd->match.fwnode);
break;
default:
break;
}
list_del(&asd->asd_list);
kfree(asd);
}
list_del(&asd->asd_list);
kfree(asd);
}
notifier->num_subdevs = 0;
}
void v4l2_async_notifier_cleanup(struct v4l2_async_notifier *notifier)
@ -618,27 +570,11 @@ int v4l2_async_notifier_add_subdev(struct v4l2_async_notifier *notifier,
mutex_lock(&list_lock);
if (notifier->num_subdevs >= V4L2_MAX_SUBDEVS) {
ret = -EINVAL;
goto unlock;
}
/*
* If caller uses this function, it cannot also allocate and
* place asd's in the notifier->subdevs array.
*/
if (WARN_ON(notifier->subdevs)) {
ret = -EINVAL;
goto unlock;
}
ret = v4l2_async_notifier_asd_valid(notifier, asd,
notifier->num_subdevs);
ret = v4l2_async_notifier_asd_valid(notifier, asd, -1);
if (ret)
goto unlock;
list_add_tail(&asd->asd_list, &notifier->asd_list);
notifier->num_subdevs++;
unlock:
mutex_unlock(&list_lock);

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

@ -20,9 +20,6 @@ struct v4l2_device;
struct v4l2_subdev;
struct v4l2_async_notifier;
/* A random max subdevice number, used to allocate an array on stack */
#define V4L2_MAX_SUBDEVS 128U
/**
* enum v4l2_async_match_type - type of asynchronous subdevice logic to be used
* in order to identify a match
@ -124,20 +121,16 @@ struct v4l2_async_notifier_operations {
* struct v4l2_async_notifier - v4l2_device notifier data
*
* @ops: notifier operations
* @num_subdevs: number of subdevices used in the subdevs array
* @subdevs: array of pointers to subdevice descriptors
* @v4l2_dev: v4l2_device of the root notifier, NULL otherwise
* @sd: sub-device that registered the notifier, NULL otherwise
* @parent: parent notifier
* @asd_list: master list of struct v4l2_async_subdev, replaces @subdevs
* @asd_list: master list of struct v4l2_async_subdev
* @waiting: list of struct v4l2_async_subdev, waiting for their drivers
* @done: list of struct v4l2_subdev, already probed
* @list: member in a global list of notifiers
*/
struct v4l2_async_notifier {
const struct v4l2_async_notifier_operations *ops;
unsigned int num_subdevs;
struct v4l2_async_subdev **subdevs;
struct v4l2_device *v4l2_dev;
struct v4l2_subdev *sd;
struct v4l2_async_notifier *parent;
@ -164,10 +157,8 @@ void v4l2_async_notifier_init(struct v4l2_async_notifier *notifier);
* @notifier: pointer to &struct v4l2_async_notifier
* @asd: pointer to &struct v4l2_async_subdev
*
* This can be used before registering a notifier to add an
* asd to the notifiers @asd_list. If the caller uses this
* method to compose an asd list, it must never allocate
* or place asd's in the @subdevs array.
* Call this function before registering a notifier to link the
* provided asd to the notifiers master @asd_list.
*/
int v4l2_async_notifier_add_subdev(struct v4l2_async_notifier *notifier,
struct v4l2_async_subdev *asd);
@ -184,10 +175,8 @@ int v4l2_async_notifier_add_subdev(struct v4l2_async_notifier *notifier,
* the driver's async sub-device struct, i.e. both
* begin at the same memory address.
*
* This can be used before registering a notifier to add a
* fwnode-matched asd to the notifiers master asd_list. If the caller
* uses this method to compose an asd list, it must never allocate
* or place asd's in the @subdevs array.
* Allocate a fwnode-matched asd of size asd_struct_size, and add it
* to the notifiers @asd_list.
*/
struct v4l2_async_subdev *
v4l2_async_notifier_add_fwnode_subdev(struct v4l2_async_notifier *notifier,

12
include/media/v4l2-fwnode.h
View File

@ -259,12 +259,6 @@ typedef int (*parse_endpoint_func)(struct device *dev,
* This function may not be called on a registered notifier and may be called on
* a notifier only once.
*
* Do not allocate the notifier's subdevs array, or change the notifier's
* num_subdevs field. This is because this function uses
* @v4l2_async_notifier_add_subdev to populate the notifier's asd_list,
* which is in-place-of the subdevs array which must remain unallocated
* and unused.
*
* The &struct v4l2_fwnode_endpoint passed to the callback function
* @parse_endpoint is released once the function is finished. If there is a need
* to retain that configuration, the user needs to allocate memory for it.
@ -316,12 +310,6 @@ int v4l2_async_notifier_parse_fwnode_endpoints(
* This function may not be called on a registered notifier and may be called on
* a notifier only once per port.
*
* Do not allocate the notifier's subdevs array, or change the notifier's
* num_subdevs field. This is because this function uses
* @v4l2_async_notifier_add_subdev to populate the notifier's asd_list,
* which is in-place-of the subdevs array which must remain unallocated
* and unused.
*
* The &struct v4l2_fwnode_endpoint passed to the callback function
* @parse_endpoint is released once the function is finished. If there is a need
* to retain that configuration, the user needs to allocate memory for it.