From: Xia Jiang <xia.jiang@mediatek.com>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Rick Chang <rick.chang@mediatek.com>
Cc: <linux-media@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Tomasz Figa <tfiga@chromium.org>, <srv_heupstream@mediatek.com>,
<senozhatsky@chromium.org>, <mojahsu@chromium.org>,
<drinkcat@chromium.org>, <maoguang.meng@mediatek.com>,
Xia Jiang <xia.jiang@mediatek.com>
Subject: [PATCH v11 14/28] media: platform: Delete redundant code and add annotation for an enum
Date: Tue, 4 Aug 2020 11:40:48 +0800 [thread overview]
Message-ID: <20200804034102.22983-15-xia.jiang@mediatek.com> (raw)
In-Reply-To: <20200804034102.22983-1-xia.jiang@mediatek.com>
Delete unused member variables annotation.
Delete unused variable definition.
Delete redundant log print, because V4L2 debug logs already print it.
Add annotation for enum mtk_jpeg_ctx_state.
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Xia Jiang <xia.jiang@mediatek.com>
---
v11: no changes
---
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 15 ++-------------
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 8 ++++++--
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index 980500be027b..db3a8b22dccd 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -176,14 +176,13 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f,
struct mtk_jpeg_ctx *ctx, int q_type)
{
struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp;
- struct mtk_jpeg_dev *jpeg = ctx->jpeg;
int i;
pix_mp->field = V4L2_FIELD_NONE;
if (ctx->state != MTK_JPEG_INIT) {
mtk_jpeg_adjust_fmt_mplane(ctx, f);
- goto end;
+ return 0;
}
pix_mp->num_planes = fmt->colplanes;
@@ -202,7 +201,7 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f,
pfmt->sizeimage = round_up(pfmt->sizeimage, 128);
if (pfmt->sizeimage == 0)
pfmt->sizeimage = MTK_JPEG_DEFAULT_SIZEIMAGE;
- goto end;
+ return 0;
}
/* type is MTK_JPEG_FMT_TYPE_CAPTURE */
@@ -219,16 +218,6 @@ static int mtk_jpeg_try_fmt_mplane(struct v4l2_format *f,
pfmt->bytesperline = stride;
pfmt->sizeimage = stride * h;
}
-end:
- v4l2_dbg(2, debug, &jpeg->v4l2_dev, "wxh:%ux%u\n",
- pix_mp->width, pix_mp->height);
- for (i = 0; i < pix_mp->num_planes; i++) {
- v4l2_dbg(2, debug, &jpeg->v4l2_dev,
- "plane[%d] bpl=%u, size=%u\n",
- i,
- pix_mp->plane_fmt[i].bytesperline,
- pix_mp->plane_fmt[i].sizeimage);
- }
return 0;
}
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
index 4d62438963c0..9b46b0507187 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
@@ -32,6 +32,12 @@
#define MTK_JPEG_HW_TIMEOUT_MSEC 1000
+/**
+ * enum mtk_jpeg_ctx_state - states of the context state machine
+ * @MTK_JPEG_INIT: current state is initialized
+ * @MTK_JPEG_RUNNING: current state is running
+ * @MTK_JPEG_SOURCE_CHANGE: current state is source resolution change
+ */
enum mtk_jpeg_ctx_state {
MTK_JPEG_INIT = 0,
MTK_JPEG_RUNNING,
@@ -113,9 +119,7 @@ struct mtk_jpeg_q_data {
* @out_q: source (output) queue information
* @cap_q: destination (capture) queue queue information
* @fh: V4L2 file handle
- * @dec_param parameters for HW decoding
* @state: state of the context
- * @header_valid: set if header has been parsed and valid
* @colorspace: enum v4l2_colorspace; supplemental to pixelformat
* @ycbcr_enc: enum v4l2_ycbcr_encoding, Y'CbCr encoding
* @quantization: enum v4l2_quantization, colorspace quantization
--
2.18.0
next prev parent reply other threads:[~2020-08-04 3:42 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 3:40 [PATCH v11 00/28] Add support for mt2701 JPEG ENC support Xia Jiang
2020-08-04 3:40 ` [PATCH v11 01/28] media: platform: Improve subscribe event flow for bug fixing Xia Jiang
2020-08-04 3:40 ` [PATCH v11 02/28] media: platform: Improve queue set up " Xia Jiang
2020-08-04 3:40 ` [PATCH v11 03/28] media: platform: Improve getting and requesting irq " Xia Jiang
2020-08-04 3:40 ` [PATCH v11 04/28] media: platform: Change the fixed device node number to unfixed value Xia Jiang
2020-08-04 3:40 ` [PATCH v11 05/28] media: platform: Improve power on and power off flow Xia Jiang
2020-08-04 3:40 ` [PATCH v11 06/28] media: platform: Delete the resetting hardware flow in the system PM ops Xia Jiang
2020-08-04 3:40 ` [PATCH v11 07/28] media: platform: Improve the implementation of " Xia Jiang
2020-08-04 3:40 ` [PATCH v11 08/28] media: platform: Add mechanism to handle jpeg hardware's locking up Xia Jiang
2020-08-04 3:40 ` [PATCH v11 09/28] media: platform: Cancel the last frame handling flow Xia Jiang
2020-08-04 3:40 ` [PATCH v11 10/28] media: platform: Delete zeroing the reserved fields Xia Jiang
2020-08-04 3:40 ` [PATCH v11 11/28] media: platform: Stylistic changes for improving code quality Xia Jiang
2020-08-04 3:40 ` [PATCH v11 12/28] media: platform: Use generic rounding helpers Xia Jiang
2020-08-04 3:40 ` [PATCH v11 13/28] media: platform: Change MTK_JPEG_COMP_MAX macro definition location Xia Jiang
2020-08-04 3:40 ` Xia Jiang [this message]
2020-08-04 3:40 ` [PATCH v11 15/28] media: platform: Delete vidioc_s_selection ioctl of jpeg dec Xia Jiang
2020-08-04 3:40 ` [PATCH v11 16/28] media: platform: Change the maximum width and height supported by JPEG dec Xia Jiang
2020-08-04 3:40 ` [PATCH v11 17/28] media: platform: Refactor mtk_jpeg_try_fmt_mplane() Xia Jiang
2020-08-04 3:40 ` [PATCH v11 18/28] media: platform: Refactor mtk_jpeg_find_format() Xia Jiang
2020-08-04 3:40 ` [PATCH v11 19/28] media: platform: Redefinition of mtk_jpeg_q_data structure Xia Jiang
2020-08-04 3:40 ` [PATCH v11 20/28] media: platform: Change the colorspace of jpeg to the fixed value Xia Jiang
2020-08-04 3:40 ` [PATCH v11 21/28] media: platform: Refactor mtk_jpeg_set_default_params() Xia Jiang
2020-08-04 3:40 ` [PATCH v11 22/28] media: platform: Change the call functions of getting/enable/disable the jpeg's clock Xia Jiang
2020-08-05 13:55 ` Tomasz Figa
2020-08-04 3:40 ` [PATCH v11 23/28] media: dt-bindings: Add jpeg enc device tree node document Xia Jiang
2020-08-04 3:40 ` [PATCH v11 24/28] arm: dts: mt2701: Add jpeg enc device tree node Xia Jiang
2020-08-04 3:40 ` [PATCH v11 25/28] media: platform: Rename jpeg dec file name Xia Jiang
2020-08-04 3:41 ` [PATCH v11 26/28] media: platform: Rename existing functions/defines/variables Xia Jiang
2020-08-04 3:41 ` [PATCH v11 27/28] media: platform: Using the variant structure to contain the varability between dec and enc Xia Jiang
2020-08-04 3:41 ` [PATCH v11 28/28] media: platform: Add jpeg enc feature Xia Jiang
2020-08-05 8:45 ` [PATCH v11 00/28] Add support for mt2701 JPEG ENC support Hans Verkuil
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=20200804034102.22983-15-xia.jiang@mediatek.com \
--to=xia.jiang@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@chromium.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=m.szyprowski@samsung.com \
--cc=maoguang.meng@mediatek.com \
--cc=matthias.bgg@gmail.com \
--cc=mchehab+samsung@kernel.org \
--cc=mojahsu@chromium.org \
--cc=rick.chang@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=senozhatsky@chromium.org \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@chromium.org \
/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).