From patchwork Tue May 10 11:51:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15853 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 00F04C326E for ; Tue, 10 May 2022 11:52:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8373965648; Tue, 10 May 2022 13:52:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1652183534; bh=qW8IIw68EVP3AedmAhYt7206Mi7WCoyGyeEfwRlV45Q=; 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=Sdw6BkLxotAXBeXfPDpMb4k4mPTX7ytDe12WEVZail927FqpNucaWP92ArmuDfYOz ONpTPOAI62sLVpXEAyEPOsw30OHTf8PrTQYyvrNWmzA5KnrTMSXS4GxDrYYn+IQprA n+KQ/TTDoBMnJcSmacWElnswZyrbBaq69y/1xuindo+jUDhLp+zDTUljaExbeqGXtk M3UpkUBkE++905aLjIpCHTXxWnvUplg/PTvlCBxIykGYGWkKXnzszrg4c/3mhq+Y52 ylYjIa2eAz7WiFsMPohZDzY0KYlKMDX2Ty7cdbcFJgY+XPgJ2dV1jL+56CK73hDNvU Wj6jMwb4+MjsQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4F8A365652 for ; Tue, 10 May 2022 13:52:08 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="B8lcUAqK"; 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 7643BB60; Tue, 10 May 2022 13:52:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1652183528; bh=qW8IIw68EVP3AedmAhYt7206Mi7WCoyGyeEfwRlV45Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B8lcUAqKsG2NeKYC5Cy4qpZLC2vGhYWtXULY2aMWPaqTFyOMpMMh5nyYUtFzyfx1G vDD5K7JfOJlwhW7h0hx1jFgIuaoSXOQ/048CqevtOTJYfGiRdLJ1gbFKVDT2k0WqXK vFjkIYUKvpof1nThhhnVfzDtOscQxRnbPDCLsvI0= To: libcamera-devel@lists.libcamera.org Date: Tue, 10 May 2022 14:51:10 +0300 Message-Id: <20220510115147.19360-14-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 13/50] staging: media: imx: imx7-media-csi: Drop unused controls support 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" Drop the unused control handler from the driver. Signed-off-by: Laurent Pinchart --- drivers/staging/media/imx/imx7-media-csi.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 2e314ce961dc..499bb74ad6f3 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -744,8 +743,6 @@ struct capture_priv { struct vb2_queue q; /* The videobuf2 queue */ struct list_head ready_q; /* List of queued buffers */ spinlock_t q_lock; /* Protect ready_q */ - - struct v4l2_ctrl_handler ctrl_hdlr; /* Controls inherited from subdevs */ }; #define to_capture_priv(v) container_of(v, struct capture_priv, vdev) @@ -1382,13 +1379,6 @@ imx7_media_capture_device_init(struct device *dev, struct v4l2_subdev *src_sd, return &priv->vdev; } -static void imx7_media_capture_device_remove(struct imx_media_video_dev *vdev) -{ - struct capture_priv *priv = to_capture_priv(vdev); - - v4l2_ctrl_handler_free(&priv->ctrl_hdlr); -} - /* ----------------------------------------------------------------------------- * V4L2 Subdev Operations */ @@ -1730,7 +1720,7 @@ static int imx7_csi_registered(struct v4l2_subdev *sd) ret = imx7_media_capture_device_register(csi->vdev, MEDIA_LNK_FL_IMMUTABLE); if (ret) - goto err_remove; + return ret; ret = v4l2_device_register_subdev_nodes(&csi->imxmd->v4l2_dev); if (ret) @@ -1744,8 +1734,6 @@ static int imx7_csi_registered(struct v4l2_subdev *sd) err_unreg: imx7_media_capture_device_unregister(csi->vdev); -err_remove: - imx7_media_capture_device_remove(csi->vdev); return ret; } @@ -1754,7 +1742,6 @@ static void imx7_csi_unregistered(struct v4l2_subdev *sd) struct imx7_csi *csi = v4l2_get_subdevdata(sd); imx7_media_capture_device_unregister(csi->vdev); - imx7_media_capture_device_remove(csi->vdev); } static const struct v4l2_subdev_video_ops imx7_csi_video_ops = {