Commit 7a2259fc authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarSakari 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: default avatarLaurent 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: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent f0e10d0a

drivers/media/v4l2-core/v4l2-async.c

+11 −11
Original line number Diff line number Diff line
@@ -213,10 +213,10 @@ v4l2_async_find_match(struct v4l2_async_notifier *notifier, 
	list_for_each_entry(asd, &notifier->waiting, list) {

		/* bus_type has been verified valid before */

		switch (asd->match.type) {

		case V4L2_ASYNC_MATCH_I2C:

		case V4L2_ASYNC_MATCH_TYPE_I2C:

			match = match_i2c;

			break;

		case V4L2_ASYNC_MATCH_FWNODE:

		case V4L2_ASYNC_MATCH_TYPE_FWNODE:

			match = match_fwnode;

			break;

		default:
@@ -241,12 +241,12 @@ static bool asd_equal(struct v4l2_async_subdev *asd_x, 
		return false;



	switch (asd_x->match.type) {

	case V4L2_ASYNC_MATCH_I2C:

	case V4L2_ASYNC_MATCH_TYPE_I2C:

		return asd_x->match.i2c.adapter_id ==

			asd_y->match.i2c.adapter_id &&

			asd_x->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;

	default:

		break;
@@ -555,8 +555,8 @@ static int v4l2_async_nf_asd_valid(struct v4l2_async_notifier *notifier, 
	struct device *dev = notifier_dev(notifier);



	switch (asd->match.type) {

	case V4L2_ASYNC_MATCH_I2C:

	case V4L2_ASYNC_MATCH_FWNODE:

	case V4L2_ASYNC_MATCH_TYPE_I2C:

	case V4L2_ASYNC_MATCH_TYPE_FWNODE:

		if (v4l2_async_nf_has_async_subdev(notifier, asd, skip_self)) {

			dev_dbg(dev, "v4l2-async: subdev descriptor already listed in a notifier\n");

			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) {

		switch (asd->match.type) {

		case V4L2_ASYNC_MATCH_FWNODE:

		case V4L2_ASYNC_MATCH_TYPE_FWNODE:

			fwnode_handle_put(asd->match.fwnode);

			break;

		default:
@@ -745,7 +745,7 @@ __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier, 
	if (!asd)

		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);



	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)

		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.address = address;
@@ -906,11 +906,11 @@ static void print_waiting_subdev(struct seq_file *s, 
				 struct v4l2_async_subdev *asd)

{

	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,

			   asd->match.i2c.address);

		break;

	case V4L2_ASYNC_MATCH_FWNODE: {

	case V4L2_ASYNC_MATCH_TYPE_FWNODE: {

		struct fwnode_handle *devnode, *fwnode = asd->match.fwnode;



		devnode = fwnode_graph_is_endpoint(fwnode) ?

include/media/v4l2-async.h

+8 −8
Original line number Diff line number Diff line
@@ -22,15 +22,15 @@ struct v4l2_async_notifier; 
 * enum v4l2_async_match_type - type of asynchronous subdevice logic to be used

 *	in order to identify a match

 *

 * @V4L2_ASYNC_MATCH_I2C: Match will check for I2C adapter ID and address

 * @V4L2_ASYNC_MATCH_FWNODE: Match will use firmware node

 * @V4L2_ASYNC_MATCH_TYPE_I2C: Match will check for I2C adapter ID and address

 * @V4L2_ASYNC_MATCH_TYPE_FWNODE: Match will use firmware node

 *

 * This enum is used by the asynchronous sub-device logic to define the

 * algorithm that will be used to match an asynchronous device.

 */

enum v4l2_async_match_type {

	V4L2_ASYNC_MATCH_I2C,

	V4L2_ASYNC_MATCH_FWNODE,

	V4L2_ASYNC_MATCH_TYPE_I2C,

	V4L2_ASYNC_MATCH_TYPE_FWNODE,

};



/**
@@ -38,17 +38,17 @@ enum v4l2_async_match_type { 
 *

 * @type:	type of match that will be used

 * @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.

 *		Both @match.i2c.adapter_id and @match.i2c.address

 *		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 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 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 {

	enum v4l2_async_match_type type;