leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: 4ee236219f ("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>
This commit is contained in:
Sakari Ailus 2017-08-14 06:43:07 -04:00 committed by Mauro Carvalho Chehab
parent 1526c704b3
commit ad3cdf3e1f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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); rval = fwnode_property_read_u32_array(fwnode, "data-lanes", NULL, 0);
if (rval > 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, fwnode_property_read_u32_array(fwnode, "data-lanes", array,
bus->num_data_lanes); bus->num_data_lanes);

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

@ -26,7 +26,7 @@
struct fwnode_handle; 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 * 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 { struct v4l2_fwnode_bus_mipi_csi2 {
unsigned int flags; 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 char clock_lane;
unsigned short num_data_lanes; unsigned short num_data_lanes;
bool lane_polarities[1 + MAX_DATA_LANES]; bool lane_polarities[1 + V4L2_FWNODE_CSI2_MAX_DATA_LANES];
}; };
/** /**