diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2017-08-14 06:43:07 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-08-26 13:52:28 -0400 |
| commit | ad3cdf3e1f37299fc1422f7828243635249a3dde (patch) | |
| tree | 13dac0ad028234c59530f21097c1f9eb55d51ce5 /drivers/media | |
| parent | 1526c704b3c32640b5e6cdc1662b0698603e9d4f (diff) | |
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-fwnode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index df7169b5ed8c..40b2fbfe8865 100644 --- 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); |