media: v4l: common: Remove v4l2_find_nearest_format

v4l2_find_nearest_format is not useful for drivers in finding the best
matching format as it assumes a V4L2 specific struct. Drivers will use
v4l2_find_nearest_size instead.

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-common.c b/drivers/media/v4l2-core/v4l2-common.c
index 9b65529dfaf671bde55f62950f8473ad5d0bafb6..b518b92d6d96e5cc3bd3047bded18d54a52f979b 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -357,32 +357,6 @@ void v4l_bound_align_image(u32 *w, unsigned int wmin, unsigned int wmax,
 }
 EXPORT_SYMBOL_GPL(v4l_bound_align_image);
 
-const struct v4l2_frmsize_discrete *
-v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes,
-                         size_t num_sizes,
-                         s32 width, s32 height)
-{
-       int i;
-       u32 error, min_error = UINT_MAX;
-       const struct v4l2_frmsize_discrete *size, *best = NULL;
-
-       if (!sizes)
-               return NULL;
-
-       for (i = 0, size = sizes; i < num_sizes; i++, size++) {
-               error = abs(size->width - width) + abs(size->height - height);
-               if (error < min_error) {
-                       min_error = error;
-                       best = size;
-               }
-               if (!error)
-                       break;
-       }
-
-       return best;
-}
-EXPORT_SYMBOL_GPL(v4l2_find_nearest_format);
-
 const void *
 __v4l2_find_nearest_size(const void *array, size_t array_size,
                         size_t entry_size, size_t width_offset,

diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 38947dc42ab6e990c648ea567cdcd89e702e3b99..160bca96d5241b8c85b7041ff711c499ae1088c7 100644 (file)
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -315,23 +315,6 @@ void v4l_bound_align_image(unsigned int *width, unsigned int wmin,
                           unsigned int hmax, unsigned int halign,
                           unsigned int salign);
 
-/**
- * v4l2_find_nearest_format - find the nearest format size among a discrete
- *     set of resolutions.
- *
- * @sizes: array of &struct v4l2_frmsize_discrete image sizes.
- * @num_sizes: length of @sizes array.
- * @width: desired width.
- * @height: desired height.
- *
- * Finds the closest resolution to minimize the width and height differences
- * between what requested and the supported resolutions.
- */
-const struct v4l2_frmsize_discrete *
-v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes,
-                         const size_t num_sizes,
-                         s32 width, s32 height);
-
 /**
  * v4l2_find_nearest_size - Find the nearest size among a discrete
  *     set of resolutions contained in an array of a driver specific struct.