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=-8.8 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 4DE15C43219 for ; Sun, 28 Apr 2019 19:10:47 +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 172F92067C for ; Sun, 28 Apr 2019 19:10:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qj2ODyKH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="X5oMBl65" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 172F92067C 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+infradead-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.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=HW+dvjerIe3yjn9YiZ1Naxuwk6pw63vjmSeuT/0RB/I=; b=qj2ODyKHM/hPMUmBBgBH1RP2+d jFVtL0CiYtuuilItFcDZuYzMEzfynTimVq3SqzXf63rcJ1i3740lxSp7smde7W1f01whxqej7wlGV BXHpMRcPALPHBubcIpJKVVFfu47brdw4nrQv5hv07VDuCvzvHZH0bNXMpLEK30kzZ3kpdxSGmQSjP ryvgv0xM0906ZTcGzIZUTtUfviNCvcFMHaHEi5Sk6tg3PpA8EqQuXlHmOWiS2/TnmgPg+sV0xOHxH AFzGGMur6QUbZ27iU+0wSeVMjj9+sn31pjw920Bi/b/KHEEJdKl8lqdCUeCaEKdxYdLq4l/LmP0A8 WCV6g/JA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKpCH-00032Z-Ra; Sun, 28 Apr 2019 19:10:45 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hKpBF-0000df-Gk for linux-arm-kernel@lists.infradead.org; Sun, 28 Apr 2019 19:09:44 +0000 Received: by mail-pg1-x541.google.com with SMTP id 85so4113783pgc.3 for ; Sun, 28 Apr 2019 12:09:41 -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; bh=/tMVTYKS5f19+Vm4lAbyz0i8RYRYsyQ7fmIGeWfhtUU=; b=X5oMBl65Gh0JL6mVOb8ik7GtY5LrDrWQHf+bIwJRwgbkrzfDWJw56XeTCRWH6424S4 jt1OFojoMsOR3n92M6zoAv+Dp8I0A3cVGFSumw5Nmt8ZX9YvvU44YDeTkbHmQXzn2KYE iXwkaI9Jm6EhyRppPC2Hyu7eWCZLmcEspbwuzS61t5odxwiUvl10BGXViH08GOvVgHBr nr+lZJlO+r4186skd8zNIeriWB6oiKSAi/3RZxRqsQjiaPebqGG/Wv5JKPzRa4sDMomA P0j6NacLuglKJ5Jywgp0IQlMNLMx7sJrDDDIxP9KINF1sK9ChlnEb32iB4EUh34kVhYP Skwg== 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; bh=/tMVTYKS5f19+Vm4lAbyz0i8RYRYsyQ7fmIGeWfhtUU=; b=LK9ObpX/LOmy7Qpd9Z/CZVcfSA5dI6zkm3RDjtVGEdMA2e+bwYt2tWPqEFRzXu2XZV XGrJaSHw8m8svcXJA5HdYGYKHCovVCUAqtDaJ7SMapuQZk4S7euQK48yw3GaP3a6/XFC TWhjiwWu1uL2Pc2SASEZRCPeKubD4IQi9EO+e2LIiCmixmHcf1ghAuHy8L3FKkhxGXDd SPEFQIIqACVlG6xdgkdyd8C39oXsQosNBiD3JKQzbATF2a3z4fR0Hn3pzBvMqEg3ZZRh r078N4DPL/e646g9i5QLOtRUHjAvyTVmHcjIqi4WBfjkuVkwRjs/gfkh0UhrLJ/6ZFVV CfMg== X-Gm-Message-State: APjAAAWe7U0QmfgZvcPx5/RWLUJd1cGwwByMKMVfuxB0ISX5d+R4XcMz Hhdf00FPi5xdkx5kk1G9nZI= X-Google-Smtp-Source: APXvYqxXRm+wORjX9rU22ovralGAytuPMNEfQGkK6GdKzvLac+9nvxiP4EXkz54MwUTY+V3Lg3z1Mg== X-Received: by 2002:aa7:8383:: with SMTP id u3mr15971576pfm.245.1556478580546; Sun, 28 Apr 2019 12:09:40 -0700 (PDT) Received: from majic.sklembedded.com (c-73-202-231-77.hsd1.ca.comcast.net. [73.202.231.77]) by smtp.googlemail.com with ESMTPSA id o14sm34204712pgn.4.2019.04.28.12.09.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 12:09:39 -0700 (PDT) From: Steve Longerbeam To: linux-media@vger.kernel.org Subject: [PATCH v2 8/8] media: staging/imx: Don't set driver data for v4l2_dev Date: Sun, 28 Apr 2019 12:09:16 -0700 Message-Id: <20190428190916.26567-9-slongerbeam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190428190916.26567-1-slongerbeam@gmail.com> References: <20190428190916.26567-1-slongerbeam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190428_120942_078439_6731F5C0 X-CRM114-Status: GOOD ( 15.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:STAGING SUBSYSTEM" , Fabio Estevam , Pengutronix Kernel Team , Greg Kroah-Hartman , Sascha Hauer , open list , NXP Linux Team , Philipp Zabel , Steve Longerbeam , Mauro Carvalho Chehab , Shawn Guo , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org The media device is already available via multiple methods, there is no need to set driver data for v4l2_dev to the media device. In imx_media_link_notify(), get media device from link->graph_obj.mdev. In imx_media_capture_device_register(), get media device from v4l2_dev->mdev. Signed-off-by: Steve Longerbeam --- drivers/staging/media/imx/imx-media-capture.c | 5 +++-- drivers/staging/media/imx/imx-media-dev-common.c | 7 ++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index b77a67bda47c..565d21f169d8 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -732,15 +732,16 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) { struct capture_priv *priv = to_capture_priv(vdev); struct v4l2_subdev *sd = priv->src_sd; + struct v4l2_device *v4l2_dev = sd->v4l2_dev; struct video_device *vfd = vdev->vfd; struct vb2_queue *vq = &priv->q; struct v4l2_subdev_format fmt_src; int ret; /* get media device */ - priv->md = dev_get_drvdata(sd->v4l2_dev->dev); + priv->md = container_of(v4l2_dev->mdev, struct imx_media_dev, md); - vfd->v4l2_dev = sd->v4l2_dev; + vfd->v4l2_dev = v4l2_dev; ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1); if (ret) { diff --git a/drivers/staging/media/imx/imx-media-dev-common.c b/drivers/staging/media/imx/imx-media-dev-common.c index 89dc4ec8dadb..66b505f7e8df 100644 --- a/drivers/staging/media/imx/imx-media-dev-common.c +++ b/drivers/staging/media/imx/imx-media-dev-common.c @@ -260,10 +260,11 @@ static int imx_media_inherit_controls(struct imx_media_dev *imxmd, static int imx_media_link_notify(struct media_link *link, u32 flags, unsigned int notification) { + struct imx_media_dev *imxmd = container_of(link->graph_obj.mdev, + struct imx_media_dev, md); struct media_entity *source = link->source->entity; struct imx_media_pad_vdev *pad_vdev; struct list_head *pad_vdev_list; - struct imx_media_dev *imxmd; struct video_device *vfd; struct v4l2_subdev *sd; int pad_idx, ret; @@ -279,8 +280,6 @@ static int imx_media_link_notify(struct media_link *link, u32 flags, sd = media_entity_to_v4l2_subdev(source); pad_idx = link->source->index; - imxmd = dev_get_drvdata(sd->v4l2_dev->dev); - pad_vdev_list = to_pad_vdev_list(sd, pad_idx); if (!pad_vdev_list) { /* nothing to do if source sd has no pad vdev list */ @@ -384,8 +383,6 @@ struct imx_media_dev *imx_media_dev_init(struct device *dev, goto cleanup; } - dev_set_drvdata(imxmd->v4l2_dev.dev, imxmd); - INIT_LIST_HEAD(&imxmd->vdev_list); v4l2_async_notifier_init(&imxmd->notifier); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel