aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: v4l: async: Rename V4L2_ASYNC_MATCH_ macros, add TYPE_

Browse Source 
The async match type is a struct field now, rename V4L2_ASYNC_MATCH_*
macros as V4L2_ASYNC_MATCH_TYPE_* instead.

This patch has been produced by:

git grep -l V4L2_ASYNC_MATCH_ -- drivers/media/ drivers/staging/media/ \
	include/ Documentation/|xargs perl -i -pe \
	's/V4L2_ASYNC_MATCH_\K/TYPE_/g'

so it must be correct.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de> # imx6qp
Tested-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> # rcar + adv746x
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Aishwarya Kothari <aishwarya.kothari@toradex.com> # Apalis i.MX6Q with TC358743
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> # Renesas RZ/G2L SMARC
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Sakari Ailus
2023-05-05 09:09:10 +02:00
committed by Mauro Carvalho Chehab
parent f0e10d0a97
commit 7a2259fc51
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,10 +213,10 @@ v4l2_async_find_match(struct v4l2_async_notifier *notifier,
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 */
switch (asd->match.type) { switch (asd->match.type) {
case V4L2_ASYNC_MATCH_I2C: case V4L2_ASYNC_MATCH_TYPE_I2C:
match = match_i2c; match = match_i2c;
break; break;
case V4L2_ASYNC_MATCH_FWNODE: case V4L2_ASYNC_MATCH_TYPE_FWNODE:
match = match_fwnode; match = match_fwnode;
break; break;
default: default:
@@ -241,12 +241,12 @@ static bool asd_equal(struct v4l2_async_subdev *asd_x,
return false; return false;
switch (asd_x->match.type) { switch (asd_x->match.type) {
case V4L2_ASYNC_MATCH_I2C: case V4L2_ASYNC_MATCH_TYPE_I2C:
return asd_x->match.i2c.adapter_id == return asd_x->match.i2c.adapter_id ==
asd_y->match.i2c.adapter_id && asd_y->match.i2c.adapter_id &&
asd_x->match.i2c.address == asd_x->match.i2c.address ==
asd_y->match.i2c.address; asd_y->match.i2c.address;
case V4L2_ASYNC_MATCH_FWNODE: case V4L2_ASYNC_MATCH_TYPE_FWNODE:
return asd_x->match.fwnode == asd_y->match.fwnode; return asd_x->match.fwnode == asd_y->match.fwnode;
default: default:
break; break;
@@ -555,8 +555,8 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier,
struct device *dev = notifier_dev(notifier); struct device *dev = notifier_dev(notifier);
switch (asd->match.type) { switch (asd->match.type) {
case V4L2_ASYNC_MATCH_I2C: case V4L2_ASYNC_MATCH_TYPE_I2C:
case V4L2_ASYNC_MATCH_FWNODE: case V4L2_ASYNC_MATCH_TYPE_FWNODE:
if (v4l2_async_nf_has_async_subdev(notifier, asd, skip_self)) { if (v4l2_async_nf_has_async_subdev(notifier, asd, skip_self)) {
dev_dbg(dev, "v4l2-async: subdev descriptor already listed in a notifier\n"); dev_dbg(dev, "v4l2-async: subdev descriptor already listed in a notifier\n");
return -EEXIST; return -EEXIST;
@@ -691,7 +691,7 @@ static void __v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier)
list_for_each_entry_safe(asd, tmp, &notifier->asd_list, asd_list) { list_for_each_entry_safe(asd, tmp, &notifier->asd_list, asd_list) {
switch (asd->match.type) { switch (asd->match.type) {
case V4L2_ASYNC_MATCH_FWNODE: case V4L2_ASYNC_MATCH_TYPE_FWNODE:
fwnode_handle_put(asd->match.fwnode); fwnode_handle_put(asd->match.fwnode);
break; break;
default: default:
@@ -745,7 +745,7 @@ __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier,
if (!asd) if (!asd)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
asd->match.type = V4L2_ASYNC_MATCH_FWNODE; asd->match.type = V4L2_ASYNC_MATCH_TYPE_FWNODE;
asd->match.fwnode = fwnode_handle_get(fwnode); asd->match.fwnode = fwnode_handle_get(fwnode);
ret = __v4l2_async_nf_add_subdev(notifier, asd); ret = __v4l2_async_nf_add_subdev(notifier, asd);
@@ -792,7 +792,7 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, int adapter_id,
if (!asd) if (!asd)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
asd->match.type = V4L2_ASYNC_MATCH_I2C; asd->match.type = V4L2_ASYNC_MATCH_TYPE_I2C;
asd->match.i2c.adapter_id = adapter_id; asd->match.i2c.adapter_id = adapter_id;
asd->match.i2c.address = address; asd->match.i2c.address = address;
@@ -906,11 +906,11 @@ static void print_waiting_subdev(struct seq_file *s,
struct v4l2_async_subdev *asd) struct v4l2_async_subdev *asd)
{ {
switch (asd->match.type) { switch (asd->match.type) {
case V4L2_ASYNC_MATCH_I2C: case V4L2_ASYNC_MATCH_TYPE_I2C:
seq_printf(s, " [i2c] dev=%d-%04x\n", asd->match.i2c.adapter_id, seq_printf(s, " [i2c] dev=%d-%04x\n", asd->match.i2c.adapter_id,
asd->match.i2c.address); asd->match.i2c.address);
break; break;
case V4L2_ASYNC_MATCH_FWNODE: { case V4L2_ASYNC_MATCH_TYPE_FWNODE: {
struct fwnode_handle *devnode, *fwnode = asd->match.fwnode; struct fwnode_handle *devnode, *fwnode = asd->match.fwnode;
devnode = fwnode_graph_is_endpoint(fwnode) ? devnode = fwnode_graph_is_endpoint(fwnode) ?

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

@@ -22,15 +22,15 @@ struct v4l2_async_notifier;
* enum v4l2_async_match_type - type of asynchronous subdevice logic to be used * enum v4l2_async_match_type - type of asynchronous subdevice logic to be used
* in order to identify a match * in order to identify a match
* *
* @V4L2_ASYNC_MATCH_I2C: Match will check for I2C adapter ID and address * @V4L2_ASYNC_MATCH_TYPE_I2C: Match will check for I2C adapter ID and address
* @V4L2_ASYNC_MATCH_FWNODE: Match will use firmware node * @V4L2_ASYNC_MATCH_TYPE_FWNODE: Match will use firmware node
* *
* This enum is used by the asynchronous sub-device logic to define the * This enum is used by the asynchronous sub-device logic to define the
* algorithm that will be used to match an asynchronous device. * algorithm that will be used to match an asynchronous device.
*/ */
enum v4l2_async_match_type { enum v4l2_async_match_type {
V4L2_ASYNC_MATCH_I2C, V4L2_ASYNC_MATCH_TYPE_I2C,
V4L2_ASYNC_MATCH_FWNODE, V4L2_ASYNC_MATCH_TYPE_FWNODE,
}; };
/** /**
@@ -38,17 +38,17 @@ enum v4l2_async_match_type {
* *
* @type: type of match that will be used * @type: type of match that will be used
* @fwnode: pointer to &struct fwnode_handle to be matched. * @fwnode: pointer to &struct fwnode_handle to be matched.
* Used if @match_type is %V4L2_ASYNC_MATCH_FWNODE. * Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_FWNODE.
* @i2c: embedded struct with I2C parameters to be matched. * @i2c: embedded struct with I2C parameters to be matched.
* Both @match.i2c.adapter_id and @match.i2c.address * Both @match.i2c.adapter_id and @match.i2c.address
* should be matched. * should be matched.
* Used if @match_type is %V4L2_ASYNC_MATCH_I2C. * Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_I2C.
* @i2c.adapter_id: * @i2c.adapter_id:
* I2C adapter ID to be matched. * I2C adapter ID to be matched.
* Used if @match_type is %V4L2_ASYNC_MATCH_I2C. * Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_I2C.
* @i2c.address: * @i2c.address:
* I2C address to be matched. * I2C address to be matched.
* Used if @match_type is %V4L2_ASYNC_MATCH_I2C. * Used if @match_type is %V4L2_ASYNC_MATCH_TYPE_I2C.
*/ */
struct v4l2_async_match_desc { struct v4l2_async_match_desc {
enum v4l2_async_match_type type; enum v4l2_async_match_type type;