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: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 4e518d5..a7c2487 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -596,12 +596,10 @@ EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link);
 
 static int
 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))
+                                         struct v4l2_async_notifier *notifier,
+                                         struct fwnode_handle *endpoint,
+                                         unsigned int asd_struct_size,
+                                         parse_endpoint_func parse_endpoint)
 {
        struct v4l2_fwnode_endpoint vep = { .bus_type = 0 };
        struct v4l2_async_subdev *asd;
@@ -657,13 +655,12 @@ out_err:
 }
 
 static int
-__v4l2_async_notifier_parse_fwnode_endpoints(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))
+__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,
+                                     parse_endpoint_func parse_endpoint)
 {
        struct fwnode_handle *fwnode;
        int ret = 0;
@@ -708,31 +705,27 @@ __v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev,
 
 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))
+                                          struct v4l2_async_notifier *notifier,
+                                          size_t asd_struct_size,
+                                          parse_endpoint_func parse_endpoint)
 {
-       return __v4l2_async_notifier_parse_fwnode_endpoints(dev, notifier,
-                                                           asd_struct_size, 0,
-                                                           false,
-                                                           parse_endpoint);
+       return __v4l2_async_notifier_parse_fwnode_ep(dev, notifier,
+                                                    asd_struct_size, 0,
+                                                    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))
+                                                  struct v4l2_async_notifier *notifier,
+                                                  size_t asd_struct_size,
+                                                  unsigned int port,
+                                                  parse_endpoint_func parse_endpoint)
 {
-       return __v4l2_async_notifier_parse_fwnode_endpoints(dev, notifier,
-                                                           asd_struct_size,
-                                                           port, true,
-                                                           parse_endpoint);
+       return __v4l2_async_notifier_parse_fwnode_ep(dev, notifier,
+                                                    asd_struct_size,
+                                                    port, true,
+                                                    parse_endpoint);
 }
 EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
 
@@ -1176,11 +1169,10 @@ out_cleanup:
 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))
+                                     size_t asd_struct_size,
+                                     unsigned int *ports,
+                                     unsigned int num_ports,
+                                     parse_endpoint_func parse_endpoint)
 {
        struct v4l2_async_notifier *notifier;
        struct device *dev = sd->dev;

diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index 21b3f9e..6d9d9f1 100644 (file)
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -346,9 +346,10 @@ 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,
-                               parse_endpoint_func parse_endpoint);
+                                                  struct v4l2_async_notifier *notifier,
+                                                  size_t asd_struct_size,
+                                                  unsigned int port,
+                                                  parse_endpoint_func parse_endpoint);
 
 /**
  * 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
  */
 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
@@ -403,11 +404,9 @@ int v4l2_async_notifier_parse_fwnode_sensor_common(struct device *dev,
  */
 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));
+                                 size_t asd_struct_size,
+                                 unsigned int *ports,
+                                 unsigned int num_ports,
+                                 parse_endpoint_func parse_endpoint);
 
 #endif /* _V4L2_FWNODE_H */