From: Benoit Parrot <bparrot@ti.com>
To: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Prabhakar Lad <prabhakar.csengg@gmail.com>,
<linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Benoit Parrot <bparrot@ti.com>
Subject: [Patch v2 10/13] media: am437x-vpfe: Remove print_fourcc helper
Date: Thu, 19 Sep 2019 15:41:22 -0500 [thread overview]
Message-ID: <20190919204125.15254-11-bparrot@ti.com> (raw)
In-Reply-To: <20190919204125.15254-1-bparrot@ti.com>
print_fourcc helper function was used for debug log to
convert a pixel format code into its readable form for display
purposes. But since it used a single static buffer to perform
the conversion this might lead to display format issue when more
than one instance was invoked simultaneously.
It turns out that print_fourcc can be safely replace by using
"%4pE" instead and passing the pointer to the fourcc code.
Signed-off-by: Benoit Parrot <bparrot@ti.com>
---
drivers/media/platform/am437x/am437x-vpfe.c | 42 +++++++--------------
1 file changed, 14 insertions(+), 28 deletions(-)
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index 605a6bb7e6c2..ad46e037fe89 100644
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -221,20 +221,6 @@ static void pix_to_mbus(struct vpfe_device *vpfe,
v4l2_fill_mbus_format(mbus_fmt, pix_fmt, fmt->code);
}
-/* Print Four-character-code (FOURCC) */
-static char *print_fourcc(u32 fmt)
-{
- static char code[5];
-
- code[0] = (unsigned char)(fmt & 0xff);
- code[1] = (unsigned char)((fmt >> 8) & 0xff);
- code[2] = (unsigned char)((fmt >> 16) & 0xff);
- code[3] = (unsigned char)((fmt >> 24) & 0xff);
- code[4] = '\0';
-
- return code;
-}
-
static int
cmp_v4l2_format(const struct v4l2_format *lhs, const struct v4l2_format *rhs)
{
@@ -696,8 +682,8 @@ static int vpfe_ccdc_set_pixel_format(struct vpfe_ccdc *ccdc, u32 pixfmt)
{
struct vpfe_device *vpfe = container_of(ccdc, struct vpfe_device, ccdc);
- vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%s\n",
- __func__, ccdc->ccdc_cfg.if_type, print_fourcc(pixfmt));
+ vpfe_dbg(1, vpfe, "%s: if_type: %d, pixfmt:%4pE\n",
+ __func__, ccdc->ccdc_cfg.if_type, &pixfmt);
if (ccdc->ccdc_cfg.if_type == VPFE_RAW_BAYER) {
ccdc->ccdc_cfg.bayer.pix_fmt = CCDC_PIXFMT_RAW;
@@ -983,8 +969,8 @@ static int vpfe_config_ccdc_image_format(struct vpfe_device *vpfe)
enum ccdc_frmfmt frm_fmt = CCDC_FRMFMT_INTERLACED;
int ret = 0;
- vpfe_dbg(1, vpfe, "pixelformat: %s\n",
- print_fourcc(vpfe->fmt.fmt.pix.pixelformat));
+ vpfe_dbg(1, vpfe, "pixelformat: %4pE\n",
+ &vpfe->fmt.fmt.pix.pixelformat);
if (vpfe_ccdc_set_pixel_format(&vpfe->ccdc,
vpfe->fmt.fmt.pix.pixelformat) < 0) {
@@ -1392,9 +1378,9 @@ static int __vpfe_get_format(struct vpfe_device *vpfe,
format->type = vpfe->fmt.type;
vpfe_dbg(1, vpfe,
- "%s: size %dx%d (%s) bytesperline = %d, size = %d, bpp = %d\n",
+ "%s: size %dx%d (%4pE) bytesperline = %d, size = %d, bpp = %d\n",
__func__, format->fmt.pix.width, format->fmt.pix.height,
- print_fourcc(format->fmt.pix.pixelformat),
+ &format->fmt.pix.pixelformat,
format->fmt.pix.bytesperline, format->fmt.pix.sizeimage, *bpp);
return 0;
@@ -1427,9 +1413,9 @@ static int __vpfe_set_format(struct vpfe_device *vpfe,
format->type = vpfe->fmt.type;
vpfe_dbg(1, vpfe,
- "%s size %dx%d (%s) bytesperline = %d, size = %d, bpp = %d\n",
+ "%s: size %dx%d (%4pE) bytesperline = %d, size = %d, bpp = %d\n",
__func__, format->fmt.pix.width, format->fmt.pix.height,
- print_fourcc(format->fmt.pix.pixelformat),
+ &format->fmt.pix.pixelformat,
format->fmt.pix.bytesperline, format->fmt.pix.sizeimage, *bpp);
return 0;
@@ -1463,8 +1449,8 @@ static int vpfe_enum_fmt(struct file *file, void *priv,
f->pixelformat = fmt->fourcc;
- vpfe_dbg(1, vpfe, "%s: mbus index: %d code: %x pixelformat: %s\n",
- __func__, f->index, fmt->code, print_fourcc(fmt->fourcc));
+ vpfe_dbg(1, vpfe, "%s: mbus index: %d code: %x pixelformat: %4pE\n",
+ __func__, f->index, fmt->code, &fmt->fourcc);
return 0;
}
@@ -1571,8 +1557,8 @@ static int vpfe_enum_size(struct file *file, void *priv,
fsize->discrete.width = fse.max_width;
fsize->discrete.height = fse.max_height;
- vpfe_dbg(1, vpfe, "%s: index: %d pixformat: %4.4s size: %dx%d\n",
- __func__, fsize->index, (char *)&fsize->pixel_format,
+ vpfe_dbg(1, vpfe, "%s: index: %d pixformat: %4pE size: %dx%d\n",
+ __func__, fsize->index, &fsize->pixel_format,
fsize->discrete.width, fsize->discrete.height);
return 0;
@@ -2242,8 +2228,8 @@ vpfe_async_bound(struct v4l2_async_notifier *notifier,
continue;
vpfe->active_fmt[i] = fmt;
vpfe_dbg(3, vpfe,
- "matched fourcc: %4.4s code: %04x idx: %d\n",
- (char *)&fmt->fourcc, mbus_code.code, i);
+ "matched fourcc: %4pE code: %04x idx: %d\n",
+ &fmt->fourcc, mbus_code.code, i);
vpfe->num_active_fmt = ++i;
}
}
--
2.17.1
next prev parent reply other threads:[~2019-09-19 20:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 20:41 [Patch 00/13] media: am437x-vpfe: overdue maintenance Benoit Parrot
2019-09-19 20:41 ` [Patch v2 01/13] media: am437x-vpfe: Fix suspend path to always handle pinctrl config Benoit Parrot
2019-09-19 20:41 ` [Patch v2 02/13] media: am437x-vpfe: Fix missing first line Benoit Parrot
2019-09-19 20:41 ` [Patch v2 03/13] media: am437x-vpfe: Rework ISR routine for clarity Benoit Parrot
2019-09-19 20:41 ` [Patch v2 04/13] media: am437x-vpfe: Wait for end of frame before tear-down Benoit Parrot
2019-09-19 20:41 ` [Patch v2 05/13] media: am437x-vpfe: fix start streaming error path Benoit Parrot
2019-09-19 20:41 ` [Patch v2 06/13] media: am437x-vpfe: Streamlined vb2 buffer cleanup Benoit Parrot
2019-09-19 20:41 ` [Patch v2 07/13] media: am437x-vpfe: Setting STD to current value is not an error Benoit Parrot
2019-09-19 20:41 ` [Patch v2 08/13] media: am437x-vpfe: Use a per instance format array instead of a static one Benoit Parrot
2019-09-20 8:19 ` Hans Verkuil
2019-09-20 12:13 ` Benoit Parrot
2019-09-19 20:41 ` [Patch v2 09/13] media: am437x-vpfe: fix function trace debug log Benoit Parrot
2019-09-19 20:41 ` Benoit Parrot [this message]
2019-09-20 8:21 ` [Patch v2 10/13] media: am437x-vpfe: Remove print_fourcc helper Hans Verkuil
2019-09-20 12:18 ` Benoit Parrot
2019-09-19 20:41 ` [Patch v2 11/13] media: am437x-vpfe: TRY_FMT ioctl is not really trying anything Benoit Parrot
2019-09-19 20:41 ` [Patch v2 12/13] media: am437x-vpfe: Remove per bus width static data Benoit Parrot
2019-09-19 20:41 ` [Patch v2 13/13] media: am437x-vpfe: Switch to SPDX Licensing Benoit Parrot
2019-09-20 8:25 ` [Patch 00/13] media: am437x-vpfe: overdue maintenance Hans Verkuil
2019-09-20 12:20 ` Benoit Parrot
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=20190919204125.15254-11-bparrot@ti.com \
--to=bparrot@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=prabhakar.csengg@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