From mboxrd@z Thu Jan 1 00:00:00 1970 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 2A96CC433EF for ; Sat, 25 Jun 2022 04:50:37 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oN+Wd4cV31nLCim+39tpo8q+asjM9wng+JSaXz9ASEg=; b=qfi6syWP0pyPD8lT91WxebpMtk vdJOhFq7mGNB6gcXo2yAUBTRPxnnYTyy7Kb3HY8Yc9eJrdVFw7SkofkIN0a8IL9HfG37NxYQ9JMj6 JKlfrvLmUTXNl/gmZRJeLNs6SLsXRh2JjEmUMfgn/OJT3IJNnr0e6/kMxFXIqlTzfeU6SfnOsXKz+ WlNaWrAv25tYquQuHrHEpi8I8d7CYx3EXw4I2MSHnl84qrMBJsbPvvNH0+oLJXi+zzlV7um6OI06z ZJNRtBoFzNapNv9xRYpjJon3pi9mB2KW0uDunGNksjUwlVzX8RW8Kn0qHopjVRK8AM1hbmRTXEFqZ XN03ay2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4xkX-004dKe-5M; Sat, 25 Jun 2022 04:50:25 +0000 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o4xkU-004dJo-2v for linux-rockchip@lists.infradead.org; Sat, 25 Jun 2022 04:50:23 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id A4DA3320091C; Sat, 25 Jun 2022 00:50:17 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 25 Jun 2022 00:50:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1656132617; x=1656219017; bh=blAuf5J9Du JTKgmoN9/Dnj0jJc61KJQnF6ZOBArbbGg=; b=VNIlLleTnVaPSvyAuU7V0SNPQX lQ1XkzRAYqR5E7NOcgd+U23YPkr/y0PYHLScyy8iL6vR/ieB5Cn08n3cSZIYZN0S ZPHtp7pRsqbRoy0j9tAH3GUZU3AGnU4URShcBTpzp6CM9L+tbyLUNGECTBUkZRgS 3DzFlmS3Ut8DOrsnpO6aNloAXa3NOjyP6jN+AowdcXR028Zoqv0+2+9wfCYA/tP6 OGu+SIWJREeDFTt6cFFtJC/Ewybr2uepvPHFozHgMwF2D+7PIJBnVtwBwFdDB/KZ R4Lxn3HC0Wa7dGk7KBXWIJi3ox+xxLippjKD20yV5wP27oIlEgpldjO0M4Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1656132617; x=1656219017; bh=blAuf5J9DuJTKgmoN9/Dnj0jJc61 KJQnF6ZOBArbbGg=; b=BtsP1oUJnpOnmcDyIOoyte+3J07UVCxlRhYPrrWCpZ+8 sDrFYNod3JCNDQvy8tE/aRvCKPjJefLI55WQqX+sHqFurTiW4VLuB1hgfNxzvX1l YagryX7Vi4hemnDRTHD93BwrKGO2V+AGh+v2bNa5QgZFIHFSlcmAWdqZvSa2Wsre iWSkLLzPcA36ndsyEXNiQivYR9XY565SEmWVwA3t0bVlA4CH1BZPP0DE24qkjEc6 gltLXDK1QmDwEWvdvh36zgF8iOJ1V+MyAei1U/FQu01WxRS6/JjboYNKjKEpHDFl kBVQ2bpfy9WBFwPyrZcBKwRM9nnN/j16lhCw9pESbQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudegtddgledtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtjeenucfhrhhomhepffgrfhhn rgcujfhirhhstghhfhgvlhguuceouggrfhhnrgesfhgrshhtmhgrihhlrdgtohhmqeenuc ggtffrrghtthgvrhhnpedvhedtledukeegveelfeeuvddujeeiteehkedvhfetkeffudej hfeftdduhedvkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpegurghfnhgrsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i0e894699:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 25 Jun 2022 00:50:13 -0400 (EDT) Date: Sat, 25 Jun 2022 07:50:10 +0300 From: Dafna Hirschfeld To: Paul Elder Cc: linux-media@vger.kernel.org, Laurent Pinchart , heiko@sntech.de, jeanmichel.hautbois@ideasonboard.com, jacopo@jmondi.org, djrscally@gmail.com, helen.koike@collabora.com, linux-rockchip@lists.infradead.org Subject: Re: [PATCH 29/55] media: rkisp1: isp: Add rkisp1_device backpointer to rkisp1_isp Message-ID: <20220625045010.w42npklynssgjvlw@guri> References: <20220614191127.3420492-1-paul.elder@ideasonboard.com> <20220614191127.3420492-30-paul.elder@ideasonboard.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220614191127.3420492-30-paul.elder@ideasonboard.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220624_215022_434036_0BE0214E X-CRM114-Status: GOOD ( 11.50 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On 15.06.2022 04:11, Paul Elder wrote: >From: Laurent Pinchart > >The rkisp1_isp structure documentation mentions a backpointer field to >rkisp1_device, but the field is missing. Add it, and use it to replace >more complicated constructs using container_of() on the v4l2_device. > >Signed-off-by: Laurent Pinchart Reviewed-by Dafna Hirschfeld >--- > .../media/platform/rockchip/rkisp1/rkisp1-common.h | 1 + > drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 11 +++++------ > 2 files changed, 6 insertions(+), 6 deletions(-) > >diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h >index 7a6f55a31bb0..3c55e922346e 100644 >--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h >+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h >@@ -162,6 +162,7 @@ struct rkisp1_csi { > */ > struct rkisp1_isp { > struct v4l2_subdev sd; >+ struct rkisp1_device *rkisp1; > struct media_pad pads[RKISP1_ISP_PAD_MAX]; > struct v4l2_subdev_pad_config pad_cfg[RKISP1_ISP_PAD_MAX]; > const struct rkisp1_mbus_info *sink_fmt; >diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c >index 812fb2ea5323..f8ab1d9cc8cd 100644 >--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c >+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c >@@ -704,15 +704,13 @@ static int rkisp1_isp_set_selection(struct v4l2_subdev *sd, > struct v4l2_subdev_state *sd_state, > struct v4l2_subdev_selection *sel) > { >- struct rkisp1_device *rkisp1 = >- container_of(sd->v4l2_dev, struct rkisp1_device, v4l2_dev); > struct rkisp1_isp *isp = to_rkisp1_isp(sd); > int ret = 0; > > if (sel->target != V4L2_SEL_TGT_CROP) > return -EINVAL; > >- dev_dbg(rkisp1->dev, "%s: pad: %d sel(%d,%d)/%dx%d\n", __func__, >+ dev_dbg(isp->rkisp1->dev, "%s: pad: %d sel(%d,%d)/%dx%d\n", __func__, > sel->pad, sel->r.left, sel->r.top, sel->r.width, sel->r.height); > mutex_lock(&isp->ops_lock); > if (sel->pad == RKISP1_ISP_PAD_SINK_VIDEO) >@@ -751,9 +749,8 @@ static const struct v4l2_subdev_pad_ops rkisp1_isp_pad_ops = { > > static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable) > { >- struct rkisp1_device *rkisp1 = >- container_of(sd->v4l2_dev, struct rkisp1_device, v4l2_dev); > struct rkisp1_isp *isp = to_rkisp1_isp(sd); >+ struct rkisp1_device *rkisp1 = isp->rkisp1; > struct rkisp1_sensor_async *asd; > int ret; > >@@ -840,12 +837,14 @@ int rkisp1_isp_register(struct rkisp1_device *rkisp1) > { > struct v4l2_subdev_state state = { > .pads = rkisp1->isp.pad_cfg >- }; >+ }; > struct rkisp1_isp *isp = &rkisp1->isp; > struct media_pad *pads = isp->pads; > struct v4l2_subdev *sd = &isp->sd; > int ret; > >+ isp->rkisp1 = rkisp1; >+ > v4l2_subdev_init(sd, &rkisp1_isp_ops); > sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; > sd->entity.ops = &rkisp1_isp_media_ops; >-- >2.30.2 > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip