@@ -218,7 +218,6 @@ static const struct imx_media_pixfmt rgb_formats[] = {
static const
struct imx_media_pixfmt *__find_format(u32 fourcc,
u32 code,
- bool allow_non_mbus,
bool allow_bayer,
const struct imx_media_pixfmt *array,
u32 array_size)
@@ -229,7 +228,7 @@ struct imx_media_pixfmt *__find_format(u32 fourcc,
for (i = 0; i < array_size; i++) {
fmt = &array[i];
- if ((!allow_non_mbus && !fmt->codes) ||
+ if ((!fourcc && !fmt->codes) ||
(!allow_bayer && fmt->bayer))
continue;
@@ -249,27 +248,26 @@ struct imx_media_pixfmt *__find_format(u32 fourcc,
static const struct imx_media_pixfmt *find_format(u32 fourcc,
u32 code,
- enum codespace_sel cs_sel,
- bool allow_non_mbus)
+ enum codespace_sel cs_sel)
{
const struct imx_media_pixfmt *ret;
switch (cs_sel & (CS_SEL_YUV | CS_SEL_RGB)) {
case CS_SEL_YUV:
- return __find_format(fourcc, code, allow_non_mbus,
+ return __find_format(fourcc, code,
cs_sel & CS_SEL_BAYER,
yuv_formats, NUM_YUV_FORMATS);
case CS_SEL_RGB:
- return __find_format(fourcc, code, allow_non_mbus,
+ return __find_format(fourcc, code,
cs_sel & CS_SEL_BAYER,
rgb_formats, NUM_RGB_FORMATS);
case CS_SEL_ANY:
- ret = __find_format(fourcc, code, allow_non_mbus,
+ ret = __find_format(fourcc, code,
cs_sel & CS_SEL_BAYER,
yuv_formats, NUM_YUV_FORMATS);
if (ret)
return ret;
- return __find_format(fourcc, code, allow_non_mbus,
+ return __find_format(fourcc, code,
cs_sel & CS_SEL_BAYER,
rgb_formats, NUM_RGB_FORMATS);
default:
@@ -278,8 +276,7 @@ static const struct imx_media_pixfmt *find_format(u32 fourcc,
}
static int enum_format(u32 *fourcc, u32 *code, u32 index,
- enum codespace_sel cs_sel,
- bool allow_non_mbus)
+ enum codespace_sel cs_sel)
{
const struct imx_media_pixfmt *fmt;
u32 mbus_yuv_sz = NUM_MBUS_YUV_FORMATS;
@@ -290,20 +287,20 @@ static int enum_format(u32 *fourcc, u32 *code, u32 index,
switch (cs_sel & (CS_SEL_YUV | CS_SEL_RGB)) {
case CS_SEL_YUV:
if (index >= yuv_sz ||
- (!allow_non_mbus && index >= mbus_yuv_sz))
+ (!fourcc && index >= mbus_yuv_sz))
return -EINVAL;
fmt = &yuv_formats[index];
break;
case CS_SEL_RGB:
if (index >= rgb_sz ||
- (!allow_non_mbus && index >= mbus_rgb_sz))
+ (!fourcc && index >= mbus_rgb_sz))
return -EINVAL;
fmt = &rgb_formats[index];
if (!(cs_sel & CS_SEL_BAYER) && fmt->bayer)
return -EINVAL;
break;
case CS_SEL_ANY:
- if (!allow_non_mbus) {
+ if (!fourcc) {
if (index >= mbus_yuv_sz) {
index -= mbus_yuv_sz;
if (index >= mbus_rgb_sz)
@@ -341,26 +338,26 @@ static int enum_format(u32 *fourcc, u32 *code, u32 index,
const struct imx_media_pixfmt *
imx_media_find_format(u32 fourcc, enum codespace_sel cs_sel)
{
- return find_format(fourcc, 0, cs_sel, true);
+ return find_format(fourcc, 0, cs_sel);
}
EXPORT_SYMBOL_GPL(imx_media_find_format);
int imx_media_enum_format(u32 *fourcc, u32 index, enum codespace_sel cs_sel)
{
- return enum_format(fourcc, NULL, index, cs_sel, true);
+ return enum_format(fourcc, NULL, index, cs_sel);
}
EXPORT_SYMBOL_GPL(imx_media_enum_format);
const struct imx_media_pixfmt *
imx_media_find_mbus_format(u32 code, enum codespace_sel cs_sel)
{
- return find_format(0, code, cs_sel, false);
+ return find_format(0, code, cs_sel);
}
EXPORT_SYMBOL_GPL(imx_media_find_mbus_format);
int imx_media_enum_mbus_format(u32 *code, u32 index, enum codespace_sel cs_sel)
{
- return enum_format(NULL, code, index, cs_sel, false);
+ return enum_format(NULL, code, index, cs_sel);
}
EXPORT_SYMBOL_GPL(imx_media_enum_mbus_format);
The find_format() and enum_format() functions take an argument that tells whether to take into account formats that don't have associated media bus codes. The same information can be deduced from the fourcc argument passed to these functions. Remove the allow_non_mbus argument and use fourcc instead internally. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/staging/media/imx/imx-media-utils.c | 31 ++++++++++----------- 1 file changed, 14 insertions(+), 17 deletions(-)