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

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

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: 4ee23621 ("media: v4l2-fwnode: suppress a warning at OF parsing logic")

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 1526c704

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

+3 −2
Original line number Diff line number Diff line
@@ -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);

include/media/v4l2-fwnode.h

+3 −3
Original line number Diff line number Diff line
@@ -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];

};



/**