To make the code easier to follow, split up find_format() into separate
search functions for pixel formats and media-bus codes. In the process
inline the code into the exported functions imx_media_find_pixel_format()
and imx_media_find_mbus_format(). Do the equivalent for enum_formats().
Also add comment blocks for the exported find|enum functions.
Signed-off-by: Steve Longerbeam <slongerbeam@xxxxxxxxx>
---
drivers/staging/media/imx/imx-media-utils.c | 152 +++++++++++++-------
1 file changed, 98 insertions(+), 54 deletions(-)
diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
index ef3702703936..a806a146f1a6 100644
--- a/drivers/staging/media/imx/imx-media-utils.c
+++ b/drivers/staging/media/imx/imx-media-utils.c
@@ -192,12 +192,19 @@ static const struct imx_media_pixfmt pixel_formats[] = {
},
};
-static const struct imx_media_pixfmt *find_format(u32 fourcc,
- u32 code,
- enum codespace_sel cs_sel)
+/*
+ * Search for and return an entry in the pixel_formats[] array that matches
+ * the requested search criteria.
+ *
+ * @fourcc: Search for an entry with the given fourcc pixel format.
+ * @cs_sel: Search for entries with the given codespace encodings
+ * (YUV, RGB, and/or BAYER).
+ */
+const struct imx_media_pixfmt *
+imx_media_find_pixel_format(u32 fourcc, enum codespace_sel cs_sel)
{
const struct imx_media_pixfmt *fmt;
- int i, j;
+ int i;
for (i = 0; i < ARRAY_SIZE(pixel_formats); i++) {
enum codespace_sel fmt_cs_sel;
@@ -207,13 +214,37 @@ static const struct imx_media_pixfmt *find_format(u32 fourcc,
((fmt->cs == IPUV3_COLORSPACE_YUV) ?
CS_SEL_YUV : CS_SEL_RGB);
- if (!(fmt_cs_sel & cs_sel) || (!fourcc && !fmt->codes))
- continue;
-
- if (fourcc && fmt->fourcc == fourcc)
+ if ((fmt_cs_sel & cs_sel) && fmt->fourcc == fourcc)
return fmt;
+ }
+
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(imx_media_find_pixel_format);
+
+/*
+ * Search for and return an entry in the pixel_formats[] array that matches
+ * the requested search criteria.
+ *
+ * @code: Search for an entry with the given media-bus code.
+ * @cs_sel: Search for entries with the given codespace encodings
+ * (YUV, RGB, and/or BAYER).
+ */
+const struct imx_media_pixfmt *
+imx_media_find_mbus_format(u32 code, enum codespace_sel cs_sel)
+{
+ const struct imx_media_pixfmt *fmt;
+ int i, j;
- if (!code || !fmt->codes)
+ for (i = 0; i < ARRAY_SIZE(pixel_formats); i++) {
+ enum codespace_sel fmt_cs_sel;
+
+ fmt = &pixel_formats[i];
+ fmt_cs_sel = fmt->bayer ? CS_SEL_BAYER :
+ ((fmt->cs == IPUV3_COLORSPACE_YUV) ?
+ CS_SEL_YUV : CS_SEL_RGB);
+
+ if (!(fmt_cs_sel & cs_sel) || !fmt->codes)
continue;
for (j = 0; fmt->codes[j]; j++) {
@@ -221,14 +252,27 @@ static const struct imx_media_pixfmt *find_format(u32 fourcc,
return fmt;
}
}
+
return NULL;
}
+EXPORT_SYMBOL_GPL(imx_media_find_mbus_format);
-static int enum_formats(u32 *fourcc, u32 *code, u32 index,
- enum codespace_sel cs_sel)
+/*
+ * Enumerate entries in the pixel_formats[] array that match the
+ * requested search criteria. Returns the fourcc that matches the
+ * search criteria at the requested match index.
+ *
+ * @fourcc: The returned fourcc that matches the search criteria at
+ * the requested match index.
+ * @index: The requested match index.
+ * @cs_sel: Include in the enumeration entries with the given codespace
+ * encodings (YUV, RGB, and/or BAYER).
+ */
+int imx_media_enum_pixel_formats(u32 *fourcc, u32 index,
+ enum codespace_sel cs_sel)
{
const struct imx_media_pixfmt *fmt;
- unsigned int i, j = 0, match_index = 0;
+ unsigned int i, match_index = 0;
for (i = 0; i < ARRAY_SIZE(pixel_formats); i++) {
enum codespace_sel fmt_cs_sel;
@@ -238,60 +282,60 @@ static int enum_formats(u32 *fourcc, u32 *code, u32 index,
((fmt->cs == IPUV3_COLORSPACE_YUV) ?
CS_SEL_YUV : CS_SEL_RGB);
- if (!(fmt_cs_sel & cs_sel) || (!fourcc && !fmt->codes))
+ if (!(fmt_cs_sel & cs_sel))
continue;
- if (fourcc && index == match_index)
- break;
-
- if (!code) {
- match_index++;
- continue;
+ if (index == match_index) {
+ *fourcc = fmt->fourcc;
+ return 0;
}
- for (j = 0; j < fmt->codes[j]; j++) {
- if (index == match_index)
- goto out;
-
- match_index++;
- }
+ match_index++;
}
- if (i == ARRAY_SIZE(pixel_formats))
- return -EINVAL;
-
-out:
- if (fourcc)
- *fourcc = fmt->fourcc;
- if (code)
- *code = fmt->codes ? fmt->codes[j] : 0;
- return 0;
+ return -EINVAL;
}
+EXPORT_SYMBOL_GPL(imx_media_enum_pixel_formats);
-const struct imx_media_pixfmt *
-imx_media_find_pixel_format(u32 fourcc, enum codespace_sel cs_sel)
+/*
+ * Enumerate entries in the pixel_formats[] array that match the
+ * requested search criteria. Returns the media-bus code that matches
+ * the search criteria at the requested match index.
+ *
+ * @code: The returned media-bus code that matches the search criteria at
+ * the requested match index.
+ * @index: The requested match index.
+ * @cs_sel: Include in the enumeration entries with the given codespace
+ * encodings (YUV, RGB, and/or BAYER).
+ */
+int imx_media_enum_mbus_formats(u32 *code, u32 index,
+ enum codespace_sel cs_sel)
{
- return find_format(fourcc, 0, cs_sel);
-}
-EXPORT_SYMBOL_GPL(imx_media_find_pixel_format);
+ const struct imx_media_pixfmt *fmt;
+ unsigned int i, j = 0, match_index = 0;
-int imx_media_enum_pixel_formats(u32 *fourcc, u32 index,
- enum codespace_sel cs_sel)
-{
- return enum_formats(fourcc, NULL, index, cs_sel);
-}
-EXPORT_SYMBOL_GPL(imx_media_enum_pixel_formats);
+ for (i = 0; i < ARRAY_SIZE(pixel_formats); i++) {
+ enum codespace_sel fmt_cs_sel;
-const struct imx_media_pixfmt *
-imx_media_find_mbus_format(u32 code, enum codespace_sel cs_sel)
-{
- return find_format(0, code, cs_sel);
-}
-EXPORT_SYMBOL_GPL(imx_media_find_mbus_format);
+ fmt = &pixel_formats[i];
+ fmt_cs_sel = fmt->bayer ? CS_SEL_BAYER :
+ ((fmt->cs == IPUV3_COLORSPACE_YUV) ?
+ CS_SEL_YUV : CS_SEL_RGB);
-int imx_media_enum_mbus_formats(u32 *code, u32 index, enum codespace_sel cs_sel)
-{
- return enum_formats(NULL, code, index, cs_sel);
+ if (!(fmt_cs_sel & cs_sel) || !fmt->codes)
+ continue;
+
+ for (j = 0; j < fmt->codes[j]; j++) {
+ if (index == match_index) {
+ *code = fmt->codes[j];
+ return 0;
+ }
+
+ match_index++;
+ }
+ }
+
+ return -EINVAL;
}
EXPORT_SYMBOL_GPL(imx_media_enum_mbus_formats);
--
2.17.1
