From: Steve Longerbeam <slongerbeam@gmail.com>
To: linux-media@vger.kernel.org
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Rui Miguel Silva <rmfrfs@gmail.com>
Subject: [PATCH 07/10] media: imx: utils: Remove unneeded argument to (find|enum)_format()
Date: Thu, 26 Mar 2020 12:05:41 -0700 [thread overview]
Message-ID: <20200326190544.16349-8-slongerbeam@gmail.com> (raw)
In-Reply-To: <20200326190544.16349-1-slongerbeam@gmail.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
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 | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
index febcf3203cb1..e5e9f750f685 100644
--- a/drivers/staging/media/imx/imx-media-utils.c
+++ b/drivers/staging/media/imx/imx-media-utils.c
@@ -194,8 +194,7 @@ 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,
- bool allow_non_mbus)
+ enum codespace_sel cs_sel)
{
const struct imx_media_pixfmt *fmt;
int i, j;
@@ -208,8 +207,7 @@ 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) ||
- (!allow_non_mbus && !fmt->codes))
+ if (!(fmt_cs_sel & cs_sel) || (!fourcc && !fmt->codes))
continue;
if (fourcc && fmt->fourcc == fourcc)
@@ -227,8 +225,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;
unsigned int i, j = 0, match_index = 0;
@@ -241,8 +238,7 @@ static int enum_format(u32 *fourcc, u32 *code, u32 index,
((fmt->cs == IPUV3_COLORSPACE_YUV) ?
CS_SEL_YUV : CS_SEL_RGB);
- if (!(fmt_cs_sel & cs_sel) ||
- (!allow_non_mbus && !fmt->codes))
+ if (!(fmt_cs_sel & cs_sel) || (!fourcc && !fmt->codes))
continue;
if (fourcc && index == match_index)
@@ -275,26 +271,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);
--
2.17.1
next prev parent reply other threads:[~2020-03-26 19:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 19:05 [PATCH 00/10] media: imx: Miscellaneous format-related cleanups Steve Longerbeam
2020-03-26 19:05 ` [PATCH 01/10] media: imx: utils: fix and simplify pixel format enumeration Steve Longerbeam
2020-03-26 19:05 ` [PATCH 02/10] media: imx: utils: fix media bus " Steve Longerbeam
2020-03-26 19:05 ` [PATCH 03/10] media: imx: utils: Inline init_mbus_colorimetry() in its caller Steve Longerbeam
2020-03-26 19:05 ` [PATCH 04/10] media: imx: utils: Handle Bayer format lookup through a selection flag Steve Longerbeam
2020-03-26 19:05 ` [PATCH 05/10] media: imx: utils: Simplify IPU format lookup and enumeration Steve Longerbeam
2020-03-26 19:05 ` [PATCH 06/10] media: imx: utils: Make imx_media_pixfmt handle variable number of codes Steve Longerbeam
2020-03-26 19:05 ` Steve Longerbeam [this message]
2020-03-26 19:05 ` [PATCH 08/10] media: imx: utils: Rename format lookup and enumeration functions Steve Longerbeam
2020-03-26 19:05 ` [PATCH 09/10] media: imx: utils: Constify mbus argument to imx_media_mbus_fmt_to_pix_fmt Steve Longerbeam
2020-03-26 19:05 ` [PATCH 10/10] media: imx: utils: Split find|enum_format into fourcc and mbus functions Steve Longerbeam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200326190544.16349-8-slongerbeam@gmail.com \
--to=slongerbeam@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=rmfrfs@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).