luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: v4l2-fwnode: cleanup functions that parse endpoints

Browse Source 
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: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2018-10-04 17:41:16 -04:00
parent 6087b21533
commit c1e630559f
2 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/media/v4l2-core/v4l2-fwnode.c
View File

@ -596,12 +596,10 @@ EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link);
static int static int
v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev, v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev,
struct v4l2_async_notifier *notifier, struct v4l2_async_notifier *notifier,
struct fwnode_handle *endpoint, struct fwnode_handle *endpoint,
unsigned int asd_struct_size, unsigned int asd_struct_size,
int (*parse_endpoint)(struct device *dev, parse_endpoint_func parse_endpoint)
struct v4l2_fwnode_endpoint *vep,
struct v4l2_async_subdev *asd))
{ {
struct v4l2_fwnode_endpoint vep = { .bus_type = 0 }; struct v4l2_fwnode_endpoint vep = { .bus_type = 0 };
struct v4l2_async_subdev *asd; struct v4l2_async_subdev *asd;
@ -657,13 +655,12 @@ v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev,
} }
static int 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, struct v4l2_async_notifier *notifier,
size_t asd_struct_size, size_t asd_struct_size,
unsigned int port, bool has_port, unsigned int port,
int (*parse_endpoint)(struct device *dev, bool has_port,
struct v4l2_fwnode_endpoint *vep, parse_endpoint_func parse_endpoint)
struct v4l2_async_subdev *asd))
{ {
struct fwnode_handle *fwnode; struct fwnode_handle *fwnode;
int ret = 0; int ret = 0;
@ -708,31 +705,27 @@ __v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev,
int int
v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev, v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev,
struct v4l2_async_notifier *notifier, struct v4l2_async_notifier *notifier,
size_t asd_struct_size, size_t asd_struct_size,
int (*parse_endpoint)(struct device *dev, parse_endpoint_func parse_endpoint)
struct v4l2_fwnode_endpoint *vep,
struct v4l2_async_subdev *asd))
{ {
return __v4l2_async_notifier_parse_fwnode_endpoints(dev, notifier, return __v4l2_async_notifier_parse_fwnode_ep(dev, notifier,
asd_struct_size, 0, asd_struct_size, 0,
false, false, parse_endpoint);
parse_endpoint);
} }
EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints); EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints);
int int
v4l2_async_notifier_parse_fwnode_endpoints_by_port(struct device *dev, v4l2_async_notifier_parse_fwnode_endpoints_by_port(struct device *dev,
struct v4l2_async_notifier *notifier, struct v4l2_async_notifier *notifier,
size_t asd_struct_size, unsigned int port, size_t asd_struct_size,
int (*parse_endpoint)(struct device *dev, unsigned int port,
struct v4l2_fwnode_endpoint *vep, parse_endpoint_func parse_endpoint)
struct v4l2_async_subdev *asd))
{ {
return __v4l2_async_notifier_parse_fwnode_endpoints(dev, notifier, return __v4l2_async_notifier_parse_fwnode_ep(dev, notifier,
asd_struct_size, asd_struct_size,
port, true, port, true,
parse_endpoint); parse_endpoint);
} }
EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port); EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
@ -1176,11 +1169,10 @@ int v4l2_async_register_subdev_sensor_common(struct v4l2_subdev *sd)
EXPORT_SYMBOL_GPL(v4l2_async_register_subdev_sensor_common); EXPORT_SYMBOL_GPL(v4l2_async_register_subdev_sensor_common);
int v4l2_async_register_fwnode_subdev(struct v4l2_subdev *sd, int v4l2_async_register_fwnode_subdev(struct v4l2_subdev *sd,
size_t asd_struct_size, size_t asd_struct_size,
unsigned int *ports, unsigned int num_ports, unsigned int *ports,
int (*parse_endpoint)(struct device *dev, unsigned int num_ports,
struct v4l2_fwnode_endpoint *vep, parse_endpoint_func parse_endpoint)
struct v4l2_async_subdev *asd))
{ {
struct v4l2_async_notifier *notifier; struct v4l2_async_notifier *notifier;
struct device *dev = sd->dev; struct device *dev = sd->dev;

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

@ -346,9 +346,10 @@ v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev,
*/ */
int int
v4l2_async_notifier_parse_fwnode_endpoints_by_port(struct device *dev, v4l2_async_notifier_parse_fwnode_endpoints_by_port(struct device *dev,
struct v4l2_async_notifier *notifier, struct v4l2_async_notifier *notifier,
size_t asd_struct_size, unsigned int port, size_t asd_struct_size,
parse_endpoint_func parse_endpoint); unsigned int port,
parse_endpoint_func parse_endpoint);
/** /**
* v4l2_fwnode_reference_parse_sensor_common - parse common references on * v4l2_fwnode_reference_parse_sensor_common - parse common references on
@ -369,7 +370,7 @@ v4l2_async_notifier_parse_fwnode_endpoints_by_port(struct device *dev,
* -EINVAL if property parsing failed * -EINVAL if property parsing failed
*/ */
int v4l2_async_notifier_parse_fwnode_sensor_common(struct device *dev, int v4l2_async_notifier_parse_fwnode_sensor_common(struct device *dev,
struct v4l2_async_notifier *notifier); struct v4l2_async_notifier *notifier);
/** /**
* v4l2_async_register_fwnode_subdev - registers a sub-device to the * v4l2_async_register_fwnode_subdev - registers a sub-device to the
@ -403,11 +404,9 @@ int v4l2_async_notifier_parse_fwnode_sensor_common(struct device *dev,
*/ */
int int
v4l2_async_register_fwnode_subdev(struct v4l2_subdev *sd, v4l2_async_register_fwnode_subdev(struct v4l2_subdev *sd,
size_t asd_struct_size, size_t asd_struct_size,
unsigned int *ports, unsigned int *ports,
unsigned int num_ports, unsigned int num_ports,
int (*parse_endpoint)(struct device *dev, parse_endpoint_func parse_endpoint);
struct v4l2_fwnode_endpoint *vep,
struct v4l2_async_subdev *asd));
#endif /* _V4L2_FWNODE_H */ #endif /* _V4L2_FWNODE_H */