media: v4l: fwnode: Use a less clash-prone name for MAX_DATA_LANES macro

Avoid using a generic name such as MAX_DATA_LANES in a header file widely
included in drivers. Instead, call it V4L2_FWNODE_CSI2_MAX_DATA_LANES.

Fixes: 4ee236219f6d ("media: v4l2-fwnode: suppress a warning at OF parsing logic")

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index df7169b5ed8cbe0c4631893e54147cd157cffdd9..40b2fbfe8865689da67e166d4bcac6dbb8496249 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -48,9 +48,10 @@ static int v4l2_fwnode_endpoint_parse_csi2_bus(struct fwnode_handle *fwnode,
 
        rval = fwnode_property_read_u32_array(fwnode, "data-lanes", NULL, 0);
        if (rval > 0) {
-               u32 array[1 + MAX_DATA_LANES];
+               u32 array[1 + V4L2_FWNODE_CSI2_MAX_DATA_LANES];
 
-               bus->num_data_lanes = min_t(int, MAX_DATA_LANES, rval);
+               bus->num_data_lanes =
+                       min_t(int, V4L2_FWNODE_CSI2_MAX_DATA_LANES, rval);
 
                fwnode_property_read_u32_array(fwnode, "data-lanes", array,
                                               bus->num_data_lanes);

diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index 08e743fb79446ec73f0ab9a393c6f07c2640b3fe..7adec9851d9e9124187a845c0ce2fae264b53e8a 100644 (file)
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -26,7 +26,7 @@
 
 struct fwnode_handle;
 
-#define MAX_DATA_LANES 4
+#define V4L2_FWNODE_CSI2_MAX_DATA_LANES        4
 
 /**
  * struct v4l2_fwnode_bus_mipi_csi2 - MIPI CSI-2 bus data structure
@@ -39,10 +39,10 @@ struct fwnode_handle;
  */
 struct v4l2_fwnode_bus_mipi_csi2 {
        unsigned int flags;
-       unsigned char data_lanes[MAX_DATA_LANES];
+       unsigned char data_lanes[V4L2_FWNODE_CSI2_MAX_DATA_LANES];
        unsigned char clock_lane;
        unsigned short num_data_lanes;
-       bool lane_polarities[1 + MAX_DATA_LANES];
+       bool lane_polarities[1 + V4L2_FWNODE_CSI2_MAX_DATA_LANES];
 };
 
 /**