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

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

media: v4l: Bring back array_size parameter to v4l2_find_nearest_size 



An older version of the driver patches were merged accidentally which
resulted in missing the array_size parameter that tells the length of the
array that contains the different supported sizes.

Bring it back to v4l2_find_nearest size and make the corresponding change
for the drivers using it as well.

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

drivers/media/i2c/ov13858.c

+3 −1
Original line number Diff line number Diff line
@@ -1375,7 +1375,9 @@ ov13858_set_pad_format(struct v4l2_subdev *sd, 
	if (fmt->format.code != MEDIA_BUS_FMT_SGRBG10_1X10)

		fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;



	mode = v4l2_find_nearest_size(supported_modes, width, height,

	mode = v4l2_find_nearest_size(supported_modes,

				      ARRAY_SIZE(supported_modes),

				      width, height,

				      fmt->format.width, fmt->format.height);

	ov13858_update_pad_format(mode, fmt);

	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {

drivers/media/i2c/ov5670.c

+3 −1
Original line number Diff line number Diff line
@@ -2230,7 +2230,9 @@ static int ov5670_set_pad_format(struct v4l2_subdev *sd, 


	fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;



	mode = v4l2_find_nearest_size(supported_modes, width, height,

	mode = v4l2_find_nearest_size(supported_modes,

				      ARRAY_SIZE(supported_modes),

				      width, height,

				      fmt->format.width, fmt->format.height);

	ov5670_update_pad_format(mode, fmt);

	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {

drivers/media/platform/vivid/vivid-vid-cap.c

+3 −2
Original line number Diff line number Diff line
@@ -561,8 +561,9 @@ int vivid_try_fmt_vid_cap(struct file *file, void *priv, 
	mp->field = vivid_field_cap(dev, mp->field);

	if (vivid_is_webcam(dev)) {

		const struct v4l2_frmsize_discrete *sz =

			v4l2_find_nearest_size(webcam_sizes, width, height,

					       mp->width, mp->height);

			v4l2_find_nearest_size(webcam_sizes,

					       VIVID_WEBCAM_SIZES, width,

					       height, mp->width, mp->height);



		w = sz->width;

		h = sz->height;

include/media/v4l2-common.h

+3 −2
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ void v4l_bound_align_image(unsigned int *width, unsigned int wmin, 
 *	set of resolutions contained in an array of a driver specific struct.

 *

 * @array: a driver specific array of image sizes

 * @array_size: the length of the driver specific array of image sizes

 * @width_field: the name of the width field in the driver specific struct

 * @height_field: the name of the height field in the driver specific struct

 * @width: desired width.
@@ -332,13 +333,13 @@ void v4l_bound_align_image(unsigned int *width, unsigned int wmin, 
 *

 * Returns the best match or NULL if the length of the array is zero.

 */

#define v4l2_find_nearest_size(array, width_field, height_field, \

#define v4l2_find_nearest_size(array, array_size, width_field, height_field, \

			       width, height)				\

	({								\

		BUILD_BUG_ON(sizeof((array)->width_field) != sizeof(u32) || \

			     sizeof((array)->height_field) != sizeof(u32)); \

		(typeof(&(*(array))))__v4l2_find_nearest_size(		\

			(array), ARRAY_SIZE(array), sizeof(*(array)),	\

			(array), array_size, sizeof(*(array)),		\

			offsetof(typeof(*(array)), width_field),	\

			offsetof(typeof(*(array)), height_field),	\

			width, height);					\