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 X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_1 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 70E50C433DF for ; Mon, 20 Jul 2020 19:25:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 536E5206F2 for ; Mon, 20 Jul 2020 19:25:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729430AbgGTTZX (ORCPT ); Mon, 20 Jul 2020 15:25:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729092AbgGTTZX (ORCPT ); Mon, 20 Jul 2020 15:25:23 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FC55C061794 for ; Mon, 20 Jul 2020 12:25:23 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id AE46128FD28 Subject: Re: [PATCH v2 5/9] media: staging: rkisp1: add a pointer to rkisp1_device from struct rkisp1_isp To: Dafna Hirschfeld , linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com Cc: ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com, sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org, mchehab@kernel.org, tfiga@chromium.org References: <20200718145918.17752-1-dafna.hirschfeld@collabora.com> <20200718145918.17752-6-dafna.hirschfeld@collabora.com> From: Helen Koike Message-ID: Date: Mon, 20 Jul 2020 16:25:16 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200718145918.17752-6-dafna.hirschfeld@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 7/18/20 11:59 AM, Dafna Hirschfeld wrote: > The code in rkisp1-isp.c requires access to struct 'rkisp1_device' > in several places. It access it using the 'container_of' macro. > This patch adds a pointer to 'rkisp1_device' in struct 'rkisp1_isp' > to simplify the access. What is wrong with container_of? I usually prefer moving to container_of then the other way around, since this avoid a new field in the struct, and also avoid the requirements of keeping the pointer in sync. Thanks Helen > > Signed-off-by: Dafna Hirschfeld > --- > drivers/staging/media/rkisp1/rkisp1-common.h | 1 + > drivers/staging/media/rkisp1/rkisp1-isp.c | 12 +++++------- > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h > index e54793d13c3d..893caa9df891 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-common.h > +++ b/drivers/staging/media/rkisp1/rkisp1-common.h > @@ -106,6 +106,7 @@ struct rkisp1_sensor_async { > */ > 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_isp_mbus_info *sink_fmt; > diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c > index 6ec1e9816e9f..b2131aea5488 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-isp.c > +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c > @@ -836,9 +836,8 @@ static int rkisp1_isp_set_selection(struct v4l2_subdev *sd, > struct v4l2_subdev_pad_config *cfg, > struct v4l2_subdev_selection *sel) > { > - struct rkisp1_device *rkisp1 = > - container_of(sd->v4l2_dev, struct rkisp1_device, v4l2_dev); > struct rkisp1_isp *isp = container_of(sd, struct rkisp1_isp, sd); > + struct rkisp1_device *rkisp1 = isp->rkisp1; > int ret = 0; > > if (sel->target != V4L2_SEL_TGT_CROP) > @@ -883,8 +882,7 @@ static const struct v4l2_subdev_pad_ops rkisp1_isp_pad_ops = { > static int rkisp1_mipi_csi2_start(struct rkisp1_isp *isp, > struct rkisp1_sensor_async *sensor) > { > - struct rkisp1_device *rkisp1 = > - container_of(isp->sd.v4l2_dev, struct rkisp1_device, v4l2_dev); > + struct rkisp1_device *rkisp1 = isp->rkisp1; > union phy_configure_opts opts; > struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; > s64 pixel_clock; > @@ -916,9 +914,8 @@ static void rkisp1_mipi_csi2_stop(struct rkisp1_sensor_async *sensor) > > 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 = &rkisp1->isp; > + struct rkisp1_isp *isp = container_of(sd, struct rkisp1_isp, sd); > + struct rkisp1_device *rkisp1 = isp->rkisp1; > struct v4l2_subdev *sensor_sd; > int ret = 0; > > @@ -997,6 +994,7 @@ int rkisp1_isp_register(struct rkisp1_device *rkisp1, > 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; >