Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1e63055 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: v4l2-fwnode: cleanup functions that parse endpoints 



There is already a typedef for the parse endpoint function.
However, instead of using it, it is redefined at the C file
(and on one of the function headers).

Replace them by the function typedef, in order to cleanup
several related coding style warnings.

Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 6087b215

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

+28 −36
Original line number Diff line number Diff line
@@ -599,9 +599,7 @@ v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev, 
					  struct v4l2_async_notifier *notifier,

					  struct fwnode_handle *endpoint,

					  unsigned int asd_struct_size,

		int (*parse_endpoint)(struct device *dev,

				      struct v4l2_fwnode_endpoint *vep,

				      struct v4l2_async_subdev *asd))

					  parse_endpoint_func parse_endpoint)

{

	struct v4l2_fwnode_endpoint vep = { .bus_type = 0 };

	struct v4l2_async_subdev *asd;
@@ -657,13 +655,12 @@ v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev, 
}



static int

__v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev,

__v4l2_async_notifier_parse_fwnode_ep(struct device *dev,

				      struct v4l2_async_notifier *notifier,

				      size_t asd_struct_size,

			unsigned int port, bool has_port,

			int (*parse_endpoint)(struct device *dev,

					      struct v4l2_fwnode_endpoint *vep,

					      struct v4l2_async_subdev *asd))

				      unsigned int port,

				      bool has_port,

				      parse_endpoint_func parse_endpoint)

{

	struct fwnode_handle *fwnode;

	int ret = 0;
@@ -710,26 +707,22 @@ int 
v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev,

					   struct v4l2_async_notifier *notifier,

					   size_t asd_struct_size,

		int (*parse_endpoint)(struct device *dev,

				      struct v4l2_fwnode_endpoint *vep,

				      struct v4l2_async_subdev *asd))

					   parse_endpoint_func parse_endpoint)

{

	return __v4l2_async_notifier_parse_fwnode_endpoints(dev, notifier,

	return __v4l2_async_notifier_parse_fwnode_ep(dev, notifier,

						     asd_struct_size, 0,

							    false,

							    parse_endpoint);

						     false, parse_endpoint);

}

EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints);



int

v4l2_async_notifier_parse_fwnode_endpoints_by_port(struct device *dev,

						   struct v4l2_async_notifier *notifier,

			size_t asd_struct_size, unsigned int port,

			int (*parse_endpoint)(struct device *dev,

					      struct v4l2_fwnode_endpoint *vep,

					      struct v4l2_async_subdev *asd))

						   size_t asd_struct_size,

						   unsigned int port,

						   parse_endpoint_func parse_endpoint)

{

	return __v4l2_async_notifier_parse_fwnode_endpoints(dev, notifier,

	return __v4l2_async_notifier_parse_fwnode_ep(dev, notifier,

						     asd_struct_size,

						     port, true,

						     parse_endpoint);
@@ -1177,10 +1170,9 @@ EXPORT_SYMBOL_GPL(v4l2_async_register_subdev_sensor_common); 


int v4l2_async_register_fwnode_subdev(struct v4l2_subdev *sd,

				      size_t asd_struct_size,

			unsigned int *ports, unsigned int num_ports,

			int (*parse_endpoint)(struct device *dev,

					      struct v4l2_fwnode_endpoint *vep,

					      struct v4l2_async_subdev *asd))

				      unsigned int *ports,

				      unsigned int num_ports,

				      parse_endpoint_func parse_endpoint)

{

	struct v4l2_async_notifier *notifier;

	struct device *dev = sd->dev;

include/media/v4l2-fwnode.h

+9 −10
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev, 
int

v4l2_async_notifier_parse_fwnode_endpoints_by_port(struct device *dev,

						   struct v4l2_async_notifier *notifier,

				size_t asd_struct_size, unsigned int port,

						   size_t asd_struct_size,

						   unsigned int port,

						   parse_endpoint_func parse_endpoint);



/**
@@ -406,8 +407,6 @@ v4l2_async_register_fwnode_subdev(struct v4l2_subdev *sd, 
				  size_t asd_struct_size,

				  unsigned int *ports,

				  unsigned int num_ports,

			int (*parse_endpoint)(struct device *dev,

					      struct v4l2_fwnode_endpoint *vep,

					      struct v4l2_async_subdev *asd));

				  parse_endpoint_func parse_endpoint);



#endif /* _V4L2_FWNODE_H */