From patchwork Fri Jun 11 23:42:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rikard Falkeborn X-Patchwork-Id: 12316667 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D1C5C48BE5 for ; Fri, 11 Jun 2021 23:47:03 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 05A7B613B8 for ; Fri, 11 Jun 2021 23:47:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 05A7B613B8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=2tZ/diVdw7NxWZTNDr0vQ9pN5SFm2X31yPRV7X3/9zw=; b=SxxijjkuZmdrmb P17Zhy/5X465MVcbdsZnD08Ik8xO2WM4p2razzRuf3XY+EK4B9LlwbcnGc4hKmGGsjBHhbngqDS0S trJCDM7cA/t5diVE9YjTX4LtzOhlBvqunqedeqUqskd4LMSgoqsxrvxBXbKNu2BKRL1FRLs5RcJsG erIFfy3ayTzzHC3cXltwsmRpIiq+kg2/3S163uANShTUSdxCys47sUvNW3Y6EcsZUYW+F55QQEJ8M LibaWOs+nidqDM4jWdVfdGP3wNVNsl6IUHS45a4mFy6NdEYXe+Ys3do9mUM97uPbXCobuW9uDeUD9 AauzBSpIiFmPjaJKzlDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrqo5-007On6-MW; Fri, 11 Jun 2021 23:43:21 +0000 Received: from mail-lf1-f41.google.com ([209.85.167.41]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrqnt-007Olh-GL for linux-arm-kernel@lists.infradead.org; Fri, 11 Jun 2021 23:43:10 +0000 Received: by mail-lf1-f41.google.com with SMTP id v22so10962449lfa.3 for ; Fri, 11 Jun 2021 16:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vw+MJMCk1jvVznn1bkcb+1btNeiCegoCcjrwneORPn4=; b=nswv/6Od8pYV0DsvhYiMUEaJPp0AH1JzRT1nil1Wi8VvYdLZKkcIpVhxsw6LBVNPp2 HF9FNiszxO9OZuRvYZ4AYxc8DTI29o1gFmibh5rDaTSZGGWdukjqrByCkwFaR9j2lhJB qSWTcFCsaG1nMwksvx8I+ox9bOOtDKnL+j7HFLwTwUXVCNpuWYQimcGQMb/xT7+jjrbe KqD/BQlvbaQKIdeKsZuSAoEAjiegVthqeqm523TOz5pksIHZMHNgW9oPj7ckkOIH2sU+ AY8daE1CarjRwIGIc/URJDWEedZ49J8+66C+5LaTFIjAz46mdVLvKcRVEqDDM+44yTnD 2PQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vw+MJMCk1jvVznn1bkcb+1btNeiCegoCcjrwneORPn4=; b=dDqxzQ9mVAuLQ6Zn+opg4MTV2TDfXuBp+C++7xDwtFbpCjavGNfmod8Zsg1hoYYlYh p7zCCZtZawNYNJwuOiJTLiNn802mCtpqg4it0UlADFZnWA+5jhl2VR4hCrx5xjx4CW9E vodEd2gsqsFtJvyHmPZfrZ1XclHha7xG9qSWcxzvPOFtafD/+UtS4C3h2CKt/U9a/jKD kibl9UkQAeCXTvXWwOn4kpHJfHc6Z4pV+nt0CJPPkly/we/eByF7XoccRhDm7XvKofrh Kod9yhJzIPP1XZ2nQLEvYUwfW4Nbt/0pNLhNsp+XT4k8uSIpSqy1HS1Xw5kPS5m3UdJb KcaA== X-Gm-Message-State: AOAM533zaqQsnLsn9oDVv+tt3tTkJSBb9Neg0u/5mizaxthbkWaIx8SD 7rWdE5Im4BF6DpS2WeAtcjU= X-Google-Smtp-Source: ABdhPJwOlIahKWZ2Fur9W+yJYlZjD9gGe8qx8jU5PX+Yu+zdSgtvBdTq9FTbytMqqCIAfVF+h4HNzw== X-Received: by 2002:a19:7410:: with SMTP id v16mr3989980lfe.189.1623454928069; Fri, 11 Jun 2021 16:42:08 -0700 (PDT) Received: from localhost.localdomain (h-98-128-228-193.NA.cust.bahnhof.se. [98.128.228.193]) by smtp.gmail.com with ESMTPSA id b23sm972246ljk.18.2021.06.11.16.42.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 16:42:07 -0700 (PDT) From: Rikard Falkeborn To: Mirela Rabulea , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer Cc: NXP Linux Team , Fabio Estevam , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Pengutronix Kernel Team , Rikard Falkeborn Subject: [PATCH 1/2] media: imx-jpeg: Constify static struct v4l2_m2m_ops Date: Sat, 12 Jun 2021 01:42:00 +0200 Message-Id: <20210611234201.64832-2-rikard.falkeborn@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210611234201.64832-1-rikard.falkeborn@gmail.com> References: <20210611234201.64832-1-rikard.falkeborn@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210611_164309_550629_A4C8C85F X-CRM114-Status: GOOD ( 14.31 ) 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 The only usage of mxc_jpeg_m2m_ops is to pass its address to v4l2_m2m_init() which takes a pointer to const struct v4l2_m2m_ops. Make it const to allow the compiler to put it in read-only memory. Signed-off-by: Rikard Falkeborn --- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c index 03b9264af068..3a49007e1264 100644 --- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c @@ -1890,7 +1890,7 @@ static const struct v4l2_file_operations mxc_jpeg_fops = { .mmap = v4l2_m2m_fop_mmap, }; -static struct v4l2_m2m_ops mxc_jpeg_m2m_ops = { +static const struct v4l2_m2m_ops mxc_jpeg_m2m_ops = { .device_run = mxc_jpeg_device_run, }; From patchwork Fri Jun 11 23:42:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rikard Falkeborn X-Patchwork-Id: 12316663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC66BC48BD1 for ; Fri, 11 Jun 2021 23:46:07 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6EFC6613B8 for ; Fri, 11 Jun 2021 23:46:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EFC6613B8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=KTIeJUdYT1RAV4sg9r94WjEtQE8Og1W9QZvRRiPtjTc=; b=qLyhBEpwriDY9Q m38gCHIvBOjpYr5tPO1iDKHeavvCkxXLiuHNx+w2Oy/wAJl25MlSkPpzIItSSLRxp/K9wXihpluBb iD5ZHlD8Kw8U5ndGpzj33dO8gzybY3Oz91DL8iAiZJzRUcEKlJ+yDdb8Z/F7/6pQqXQ04L9BziURB Su2uDdW5vnb5vooCRa19H06kRopcgcju2hT1cQfnQmjT3EsYAhUooMrifbjbjxCYP8E3D7q+g4qMf GHnY8vC6qp8soZjNjrEqKnTfeK73d5aNVaTvICN5ekZEPvp8DOnRHfPRhYposzIofR4nY/qakV0Zc r3Cn25O1e/1B3igV6hqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrqn0-007Ohf-QD; Fri, 11 Jun 2021 23:42:14 +0000 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lrqmx-007OgW-98 for linux-arm-kernel@lists.infradead.org; Fri, 11 Jun 2021 23:42:12 +0000 Received: by mail-lj1-x229.google.com with SMTP id a19so8556633ljq.12 for ; Fri, 11 Jun 2021 16:42:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aRw7BPNktlSQ8Bpwkfd9XqquSjVtSyBra5TkrCf39nw=; b=SkSPQn1YLgf4eB2184cpjDPdofARNgCS+pxpukZiniDyhQ+CcJKIuPW4uzFOqaSXJv J+BmnsELecpkMSn6+1zDTxFIVg41BNTtm7SWehd7ua/9PPp76/FBwIHeQSQJScr/1oga JOvUPHKaygDlDhzaue76p5+osbFTwyRUV6eBewnkXL5pCR3Uuq1dVlxdHJ8FhfH6kcn2 JQ/mSXN9I7k/NT0Xsh7/DTLiusg0wj7SHIF0EFUrDQiq3q5LQS4dQ78G1EdzrAAz1S89 ychDj4dkNiXXzaXfEZbhabb1NcX94aZfvu2CXcx2jcfxupXtMxd1s7RaXQJ6519eNiHh Y0qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aRw7BPNktlSQ8Bpwkfd9XqquSjVtSyBra5TkrCf39nw=; b=sgk7FjOwMz9wucMQ5sIeh6702InpyNW8l/4eNp0nR+kPUCRllLUNbPiVAjuJuG/5Sb S5EY3B2/rnVlnBrxg4vVdWZX7KSTegaIR/A+c/nrFK9ktPwvCfYaSMXUy3ZccBCqhoPR aE5WL7Ngr/DzABa7Xvh+v83T9XilgVz/mRf69zOCtXC2FxV2LVTGQn5ow07hQTK5qk3e e7Nlf7wkc0gVWz5JkadJkW2AJz3vMCjCJ/2PonfppIQNbNQZgfStGrTVkux/xV5wgDVi 6q/Pi1iPVXn54gCGsPfvJw+yXw1W02TTgkMzYpnkICYVukf6WsKxj34rgtE4ifMaSFQz xEIQ== X-Gm-Message-State: AOAM533G1kLvFWoW+1U6pRkT7rSOIKK3Cv3hsC5w2voG3fhrR1E/K188 RIw0h3QVmGOHB83uyRRdAwk= X-Google-Smtp-Source: ABdhPJzdZQgVxu8KHs5S94L9UZiEP/Hh55YTVP6uT5f2rUjXtodE9hgli7NLwIHJymqAJzMFLEgJjQ== X-Received: by 2002:a2e:a4c2:: with SMTP id p2mr4821128ljm.365.1623454928898; Fri, 11 Jun 2021 16:42:08 -0700 (PDT) Received: from localhost.localdomain (h-98-128-228-193.NA.cust.bahnhof.se. [98.128.228.193]) by smtp.gmail.com with ESMTPSA id b23sm972246ljk.18.2021.06.11.16.42.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 16:42:08 -0700 (PDT) From: Rikard Falkeborn To: Mirela Rabulea , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer Cc: NXP Linux Team , Fabio Estevam , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Pengutronix Kernel Team , Rikard Falkeborn Subject: [PATCH 2/2] media: imx-jpeg: Constify static struct mxc_jpeg_fmt Date: Sat, 12 Jun 2021 01:42:01 +0200 Message-Id: <20210611234201.64832-3-rikard.falkeborn@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210611234201.64832-1-rikard.falkeborn@gmail.com> References: <20210611234201.64832-1-rikard.falkeborn@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210611_164211_327180_BE8F3A43 X-CRM114-Status: GOOD ( 18.03 ) 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 It is only read-from, so make it const. In order to be able to do this, constify all places where mxc_jpeg_fmt is used, in function arguments, return values and pointers. On top of that, make the name a pointer to const char. On aarch64, this shrinks object code size with 550 bytes with gcc 11.1.0, and almost 2kB with clang 12.0.0. Signed-off-by: Rikard Falkeborn --- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 16 ++++++++-------- drivers/media/platform/imx-jpeg/mxc-jpeg.h | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c index 3a49007e1264..755138063ee6 100644 --- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c @@ -62,7 +62,7 @@ #include "mxc-jpeg-hw.h" #include "mxc-jpeg.h" -static struct mxc_jpeg_fmt mxc_formats[] = { +static const struct mxc_jpeg_fmt mxc_formats[] = { { .name = "JPEG", .fourcc = V4L2_PIX_FMT_JPEG, @@ -341,7 +341,7 @@ static inline struct mxc_jpeg_ctx *mxc_jpeg_fh_to_ctx(struct v4l2_fh *fh) return container_of(fh, struct mxc_jpeg_ctx, fh); } -static int enum_fmt(struct mxc_jpeg_fmt *mxc_formats, int n, +static int enum_fmt(const struct mxc_jpeg_fmt *mxc_formats, int n, struct v4l2_fmtdesc *f, u32 type) { int i, num = 0; @@ -368,13 +368,13 @@ static int enum_fmt(struct mxc_jpeg_fmt *mxc_formats, int n, return 0; } -static 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(struct mxc_jpeg_ctx *ctx, + u32 pixelformat) { unsigned int k; for (k = 0; k < MXC_JPEG_NUM_FORMATS; k++) { - struct mxc_jpeg_fmt *fmt = &mxc_formats[k]; + const struct mxc_jpeg_fmt *fmt = &mxc_formats[k]; if (fmt->fourcc == pixelformat) return fmt; @@ -1536,7 +1536,7 @@ static int mxc_jpeg_enum_fmt_vid_out(struct file *file, void *priv, MXC_JPEG_FMT_TYPE_RAW); } -static int mxc_jpeg_try_fmt(struct v4l2_format *f, struct mxc_jpeg_fmt *fmt, +static int mxc_jpeg_try_fmt(struct v4l2_format *f, const struct mxc_jpeg_fmt *fmt, struct mxc_jpeg_ctx *ctx, int q_type) { struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; @@ -1612,7 +1612,7 @@ static int mxc_jpeg_try_fmt_vid_cap(struct file *file, void *priv, struct mxc_jpeg_ctx *ctx = mxc_jpeg_fh_to_ctx(priv); struct mxc_jpeg_dev *jpeg = ctx->mxc_jpeg; struct device *dev = jpeg->dev; - struct mxc_jpeg_fmt *fmt; + const struct mxc_jpeg_fmt *fmt; u32 fourcc = f->fmt.pix_mp.pixelformat; int q_type = (jpeg->mode == MXC_JPEG_DECODE) ? @@ -1643,7 +1643,7 @@ static int mxc_jpeg_try_fmt_vid_out(struct file *file, void *priv, struct mxc_jpeg_ctx *ctx = mxc_jpeg_fh_to_ctx(priv); struct mxc_jpeg_dev *jpeg = ctx->mxc_jpeg; struct device *dev = jpeg->dev; - struct mxc_jpeg_fmt *fmt; + const struct mxc_jpeg_fmt *fmt; u32 fourcc = f->fmt.pix_mp.pixelformat; int q_type = (jpeg->mode == MXC_JPEG_ENCODE) ? diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.h b/drivers/media/platform/imx-jpeg/mxc-jpeg.h index 7697de490d2e..4c210852e876 100644 --- a/drivers/media/platform/imx-jpeg/mxc-jpeg.h +++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.h @@ -51,7 +51,7 @@ enum mxc_jpeg_mode { * @flags: flags describing format applicability */ struct mxc_jpeg_fmt { - char *name; + const char *name; u32 fourcc; enum v4l2_jpeg_chroma_subsampling subsampling; int nc; @@ -74,14 +74,14 @@ struct mxc_jpeg_desc { } __packed; struct mxc_jpeg_q_data { - struct mxc_jpeg_fmt *fmt; - u32 sizeimage[MXC_JPEG_MAX_PLANES]; - u32 bytesperline[MXC_JPEG_MAX_PLANES]; - int w; - int w_adjusted; - int h; - int h_adjusted; - unsigned int sequence; + const struct mxc_jpeg_fmt *fmt; + u32 sizeimage[MXC_JPEG_MAX_PLANES]; + u32 bytesperline[MXC_JPEG_MAX_PLANES]; + int w; + int w_adjusted; + int h; + int h_adjusted; + unsigned int sequence; }; struct mxc_jpeg_ctx {