From patchwork Tue May 10 11:51:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15869 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 28715C326F for ; Tue, 10 May 2022 11:52:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B00BE6566E; Tue, 10 May 2022 13:52:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1652183550; bh=Q5pLB1e2XYYIIIEjFrPhWLsfrzF2a4m2XFlEvoFIpmM=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=RAmsnwQUB63VnBQHThFaFfDggTfX2h5xxZ0mHv5JRfyG4iAL92lS4JNX6ARaN9Ixz wBQbTYwr2MJzZmaQwH8lUyW1S8HLDW4eQhsl9re+sUzgcdwNJV95ey6QyVC8JTvsvm VfJkHpwtpn6xoHET9//3lV66xIeMhCqwsz9tkH+dONu+VjlvXf2twA+O6B9sITcd3+ KCHbD3s/erj18+HIEN53TtHdLghDqjgzavFG6BbUXo5LeZ3PzbH3QZk9SracSDaNk3 sabNsy/oRUDgFjMNLdr63B+U6NuSrWXn61v+44EhgDcqjsWAJ3tr2ZOlMcJCX4ASyN bLjsBazbi5Pyw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D2C116566E for ; Tue, 10 May 2022 13:52:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="A1mh1onn"; dkim-atps=neutral Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EE49AB9A; Tue, 10 May 2022 13:52:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1652183541; bh=Q5pLB1e2XYYIIIEjFrPhWLsfrzF2a4m2XFlEvoFIpmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A1mh1onnGcsAoADCaWcs0nvAvwPk6hFy77hJpkoRlVbpIXo7y5dP4e5d6vcaE7Q39 c+aPZSd3sdKrFo8MnY2PO7DPThNLMt8P0jMXjn9CNgFqiEo8vNyuxgzBH+hOp+n18C ApkdY1zvp0b7UkrzsBqL9a2GNpDGfXn1lNVqRxdg= To: libcamera-devel@lists.libcamera.org Date: Tue, 10 May 2022 14:51:26 +0300 Message-Id: <20220510115147.19360-30-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220510115147.19360-1-laurent.pinchart@ideasonboard.com> References: <20220510115147.19360-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 29/50] staging: media: imx: imx7-media-csi: Store imx7_csi in drv data X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Cc: Martin Kepplinger , kernel@pengutronix.de, Dorota Czaplejewicz , Alexander Stein , Rui Miguel Silva , Philipp Zabel , Steve Longerbeam Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Replace the subdev pointer stored in platform drv data with the imx7_csi pointer. Drop a now redundant dev_set_drvdata() call. Signed-off-by: Laurent Pinchart --- drivers/staging/media/imx/imx7-media-csi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 14683a15e003..5a5157d8b27b 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -1842,8 +1842,6 @@ static int imx7_csi_media_dev_init(struct imx7_csi *csi) { int ret; - dev_set_drvdata(csi->dev, csi); - strscpy(csi->mdev.model, "imx-media", sizeof(csi->mdev.model)); csi->mdev.ops = &imx7_csi_media_ops; csi->mdev.dev = csi->dev; @@ -1913,7 +1911,7 @@ static int imx7_csi_probe(struct platform_device *pdev) return -ENOMEM; csi->dev = dev; - platform_set_drvdata(pdev, &csi->sd); + platform_set_drvdata(pdev, csi); spin_lock_init(&csi->irqlock); mutex_init(&csi->lock); @@ -1977,14 +1975,13 @@ static int imx7_csi_probe(struct platform_device *pdev) static int imx7_csi_remove(struct platform_device *pdev) { - struct v4l2_subdev *sd = platform_get_drvdata(pdev); - struct imx7_csi *csi = v4l2_get_subdevdata(sd); + struct imx7_csi *csi = platform_get_drvdata(pdev); imx7_csi_media_cleanup(csi); v4l2_async_nf_unregister(&csi->notifier); v4l2_async_nf_cleanup(&csi->notifier); - v4l2_async_unregister_subdev(sd); + v4l2_async_unregister_subdev(&csi->sd); mutex_destroy(&csi->lock);