From patchwork Tue Feb 14 10:04:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Qian X-Patchwork-Id: 13139800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DF382C05027 for ; Tue, 14 Feb 2023 10:09:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rb9UQA2Cm7fRmN9AGCBHFFBcSJnyKxCn7A7Z/lCYOwY=; b=AENaMH7hRJeTT5 6m3NNrd2ARSB6+YQEorTId8gn7RFygkvQ5zURaw2icmNtL/HnINyZbFZSG0x1iX2lrDUbVt46L4UM GiUvt7emlZz21QaMyUiwH4xr3GQsAhvhxyGuO3FeN78Jxi7QG/ifdPA9kWPz5IYL65utjks0hbX3y 9gpyl1f1C6LfZO+R0/o1NXAGHtSvnVtMWItVN2jDDjhTO/yoJuVzsbR2FLv0LcyolYJ7aai0ozORw Cd1A2Jj6UjgjRZG7Y0xlqTzaX6Pq2p4tWsPSH1JjW15xGp+yiLLQ7tRVxfWUgmOy6iLzK8WCgh6fk 7StNeoZaPVIrDIFR62uQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRsEF-000u4B-Se; Tue, 14 Feb 2023 10:08:04 +0000 Received: from mail-am7eur03on20613.outbound.protection.outlook.com ([2a01:111:f400:7eaf::613] helo=EUR03-AM7-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pRsCV-000sxW-9j for linux-arm-kernel@lists.infradead.org; Tue, 14 Feb 2023 10:06:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jZI9O0Gow+csqnIi7dfzD5BYo+VO/ouYi/90j4ACY70bRpuKPntT3N5lib6bPLnPPVnOiKuICgpYFi9NH4u0fpgblZm+5JnapfbgRwK1HQl0co9pzb2Of0Hur+lkmxdtNWIHaAXWVqJNmqG62/o/iIHjLKtOnu3WXr6Hl4gzxn3Fn1SvEqeTIe+Pv8C+4/Wi4L6aK8zpcMnkV0iYSj0ybGpMET9s+8gpVLisMZTj7e8rg8V1R87AWKIJfQqiuZZqZuEmoYc6Yovm6+C9Tfk89rVZSWSOqo9jzPEdlyO3qorLPQMfrAWksBD87TN+LmpItG9nM/T7++SU8Jlf2VZLxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8HtPUGDrL90dDHNDgqSHbRFOdqqqZXS5JUCzQX0fw9o=; b=N5d8Wx+zxDPjyvO/VA1wxULAm4TzZyc7nRb1wQ7QpKT5Xzv+/iR9zSdVJmBQylNawNC+/CO8g8xkEAZEHvjJdyIU2zW/h3XaZlTfTPdjCWP3+BwnogsxJAsdnCLFgXnG8rsVcAdfyhTKQ2+AryFzkEolh+3VArk42tHZYjgVUd8zKqk8bikPsKXTxX7B0g1GsBA0HFFSi8HzFStOV1n3HZAEJQIZ04cYItkwao9sS2ksfOS9ELVb/+vMAQxm2cedQ547sSK2/wUlgfHy5D47SsThEOYqX48fMS3xYm8tFi9sQIzoWKC5ApuzT/oJ0X23tOt60JTglE94ULlTyY4K1w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8HtPUGDrL90dDHNDgqSHbRFOdqqqZXS5JUCzQX0fw9o=; b=jLOLPm4bppzTb6KDmWRoFOFszbtAnmS8kJO3IMGraKmiI2kVNi5s8MG/q9itB2aj3Zftc+bLR3ns7l3XIvmYjLsMhhxN0dSj+Vj4yFP+eULhF3zfgcpRHfH96Vzo6XeEzOjycLxu037wveOGOIHqPLAGS5IAkvAE6THk8PhJ8KM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) by VI1PR04MB6800.eurprd04.prod.outlook.com (2603:10a6:803:133::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.23; Tue, 14 Feb 2023 10:06:11 +0000 Received: from AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::3a82:42b3:f1ed:5c3d]) by AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::3a82:42b3:f1ed:5c3d%7]) with mapi id 15.20.6086.023; Tue, 14 Feb 2023 10:06:11 +0000 From: Ming Qian To: mchehab@kernel.org, mirela.rabulea@oss.nxp.com, hverkuil-cisco@xs4all.nl Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, xiahong.bao@nxp.com, linux-imx@nxp.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 07/10] media: imx-jpeg: Refine the function mxc_jpeg_find_format Date: Tue, 14 Feb 2023 18:04:49 +0800 Message-Id: <28d3f4f44f7da5bd84a03468f0fb541734395a66.1676368610.git.ming.qian@nxp.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: X-ClientProxiedBy: SI2PR01CA0035.apcprd01.prod.exchangelabs.com (2603:1096:4:192::13) To AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB6341:EE_|VI1PR04MB6800:EE_ X-MS-Office365-Filtering-Correlation-Id: 22cba84a-df0c-4e6d-7032-08db0e731958 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9Vhwb+1Y9Ywd/Zd1p9pO/V7IflRcrw2ypFlg7zVPnp7ygIMQZF7Xr/TUu5H+143J/KiGTWJhVKR08Dkgm9jACCjvxCNg12SkZ4EFdHxvL6BRs6OZocoM8FlZ4Vs2WLIy6F2MFVLf+skSeGsCKqeXsiC5o5PboZPuW5Jm23D1a2xGtimh5IL165tG0p5KJOuOyF4Bwsu8CFqHonxpnHzLjlrVSOxiBc4E0nTfiC88S2sHhEeeomrtm/tHA5K7QMs6+npV4sHnVBE7SWssQFDqFt6PpGXwUIDqlvYslo0v/E0JhGQCxzjbAuifwZLRsAciQejg3kx0u3bIWX9lKVBlLX4+AXV0JlQmrpE1SDW5UWK2iiYLU432ZkDwhNUv96kZXwD7dQw5/7cuV/dWb4CaH5hnC4APabHrR9Q/xNy6KownF7VfBwzjji4AsfjINva/vMYgRSwk5DLIpHxdoZqfYN7tHGyYySW81SmVO4hjJYWBFyc0muXbnGwWDkBQFw0+q8FzUcJ1GjZfXJBGVYpHVdpwIcsD7OlMY9ife2StxuxQ+9BGpNNJknc4JmOT5QUmigQr8DW1qCY8o6JYzXt7WxFqW26Yd/3dLGE0xC/Fn2fdqWs/wVMbRO5w1wAf6s6WlpFHrvhmbhr2YMHJNA+vtD2iP31uDHuafDJmEn0juDYfK337Te7jPUTtF8yP4qTyFOZqLHh2DcbLlZDk2jxLZA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6341.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(376002)(136003)(366004)(39860400002)(396003)(346002)(451199018)(6506007)(52116002)(83380400001)(6486002)(2906002)(36756003)(26005)(186003)(38100700002)(66556008)(8676002)(66476007)(66946007)(8936002)(6666004)(6512007)(38350700002)(2616005)(4326008)(44832011)(478600001)(316002)(86362001)(5660300002)(7416002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pPfijjKbSQwdLLpRrbKzN1ws3eW8gnzR5QlvXDLikVoTw1CCIZUbLwXRS3OL8RdFztAYLOvwVdVXpdQVE/0jvgoK4RsWJccbYb2/2jySsVPieJn0zqGXDiRGjjSfpTEASEBQoQZ55mSInXGjk6JpoGoOOrC/xCZOPVQIZ41ehSHk9KbduUrSr/RQ8IdU1Jxko5x1qBjjBpx6J9L3LfJMLLBQbPNKfPKZ4NKqNMPaTrlNcHzeJtv1POX0chyIAnR6omV/aKB+dwqLUBNnP1M2YW0yU7n/44u62gxCJuNduAGsIWcZWNC2DzikMVnUHOzRNA4A20CnkkJYWRGosN1hAE1Edr37a+LeekGp04g2K6TAobJfMtiQ2Bhgp66kZ51SQqDICBsSDpIe3H9gtp06r/8r4+MjrSaqU0f8E+RW+stuACEjTM35o8JdL/JR9rP44PBAH8qXd7I+mb6Y46/D1HVreAsCUdr1GhxCzFhB1f90FTnqPl/r1wZu/6FN+xQ4RkQydgfhYwbZePtTw6i0jQFm9Y3+PoJfzqJvzvOmMEQ7NLpuXZ/CzefpzDHc70k/pwviAuqInd8WiJ+gkTfuj5e86xY/a5k2FCL/iD9V71agpLkkRX2bBb0JMSqeQhIzMr0Y25Oxj56GLhmkVjc3kEGb7Z4kQarcuMkiJSVwW6fuKkuHzxETFWFOjnvDvMRV1g2pPRCqvckI4jvjJicDfcYOn9wmXJUeZ+V6MQcDwfw+vt8W65y4ncBZusjble9BKqWLqUpu2Fnox9XsELwt7M3GhoDEEGtbSJNkKbbFGZWIyCrLR2gDIbt+B3llFfb8LFEFYHwH6G6fwZrxeOyMpTuMRczKTxxLosXhxaXxHqHk3/+sI1pXtcb/XlQBFOjdkRBetpJqtubXRAn56WqJDESJwfIZX8P9OdusvqBBT/bBP6lWROQiyi1WUpvF3ZrmP8UBG6XELPXwtAannDu59saJ4seGdXCfesx/E7pXCTOqG384uc2GtWWyq/T+v7tDUa7FD0jtHKXgPDhuaEJVVkmzGc1BZCZlaBe6z9qBCSkAG1lf8Y+jQx601Ra5QqFjYPy90XfRmSwLk5GqkR/ffHziwB+g7zgTUNI6WMcXJ0WIVeX17otj3yabRPLAJhyUIGnGH/+Do8owqpqEx2UEGUNsZ7rzkGnWWeRGr782eyzw81OMoZQaCLrYqzW20BdCkNIuZ+JKHMiQPcHFdEKeKxOS5q2SUTU2+GITZGrMFp0+jCaPaNjnPWAmsqY8sgEN+i7tDIWTm5qHrfOFRQsNF+1kyzM5hHeHWyxRUFP6QaweCDT2SNijD/RBLTwh/OC+ajjQ3kX0i46G7pGBwRebI+CpT4Zr9Qyna/3aBaHjFngiUPP19dLFby/fX42Othfr85CQo9hYJQptmccbxj8/+6K9O94cjOF/rxkKFF19OqGy1SOB602HpFgnQGYergESbMrzzt+bXIR645jZJ9YgtsnOmPhrtqHh5oUwUI0WCQFHfonbnbs5Jhl1vvNzcad1V/FiIDNnpQM7DoWaaYj4V9iVEb36yMqxDlCodeP8yJZnlpuyDoSTr96wYDccw4/K X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22cba84a-df0c-4e6d-7032-08db0e731958 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 10:06:11.6529 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: N7Z195wHhC10pW5qsnH8ZzaFrJOveVhB957p888b5LO3nNyT+NXdu+QuEbufUafkfdPG+9jxVzl3ccdk3sPleQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6800 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230214_020615_763965_47CD9D79 X-CRM114-Status: GOOD ( 13.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org remove the unused parameter ctx Signed-off-by: Ming Qian --- drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c index f085f14d676a..70b6eea733e7 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -420,8 +420,7 @@ static int enum_fmt(const struct mxc_jpeg_fmt *mxc_formats, int n, return 0; } -static const struct mxc_jpeg_fmt *mxc_jpeg_find_format(struct mxc_jpeg_ctx *ctx, - u32 pixelformat) +static const struct mxc_jpeg_fmt *mxc_jpeg_find_format(u32 pixelformat) { unsigned int k; @@ -1562,7 +1561,7 @@ static int mxc_jpeg_parse(struct mxc_jpeg_ctx *ctx, struct vb2_buffer *vb) if (fourcc == 0) return -EINVAL; - jpeg_src_buf->fmt = mxc_jpeg_find_format(ctx, fourcc); + jpeg_src_buf->fmt = mxc_jpeg_find_format(fourcc); jpeg_src_buf->w = header.frame.width; jpeg_src_buf->h = header.frame.height; ctx->header_parsed = true; @@ -1702,11 +1701,11 @@ static void mxc_jpeg_set_default_params(struct mxc_jpeg_ctx *ctx) int i; if (ctx->mxc_jpeg->mode == MXC_JPEG_ENCODE) { - out_q->fmt = mxc_jpeg_find_format(ctx, MXC_JPEG_DEFAULT_PFMT); - cap_q->fmt = mxc_jpeg_find_format(ctx, V4L2_PIX_FMT_JPEG); + out_q->fmt = mxc_jpeg_find_format(MXC_JPEG_DEFAULT_PFMT); + cap_q->fmt = mxc_jpeg_find_format(V4L2_PIX_FMT_JPEG); } else { - out_q->fmt = mxc_jpeg_find_format(ctx, V4L2_PIX_FMT_JPEG); - cap_q->fmt = mxc_jpeg_find_format(ctx, MXC_JPEG_DEFAULT_PFMT); + out_q->fmt = mxc_jpeg_find_format(V4L2_PIX_FMT_JPEG); + cap_q->fmt = mxc_jpeg_find_format(MXC_JPEG_DEFAULT_PFMT); } for (i = 0; i < 2; i++) { @@ -1950,7 +1949,7 @@ static int mxc_jpeg_try_fmt(struct v4l2_format *f, pix_mp->height : MXC_JPEG_MAX_HEIGHT; int i; - fmt = mxc_jpeg_find_format(ctx, fourcc); + fmt = mxc_jpeg_find_format(fourcc); if (!fmt || fmt->flags != mxc_jpeg_get_fmt_type(ctx, f->type)) { dev_warn(ctx->mxc_jpeg->dev, "Format not supported: %c%c%c%c, use the default.\n", (fourcc & 0xff), @@ -1958,7 +1957,7 @@ static int mxc_jpeg_try_fmt(struct v4l2_format *f, (fourcc >> 16) & 0xff, (fourcc >> 24) & 0xff); fourcc = mxc_jpeg_get_default_fourcc(ctx, f->type); - fmt = mxc_jpeg_find_format(ctx, fourcc); + fmt = mxc_jpeg_find_format(fourcc); if (!fmt) return -EINVAL; f->fmt.pix_mp.pixelformat = fourcc;