{"id":15846,"url":"https://patchwork.libcamera.org/api/patches/15846/?format=json","web_url":"https://patchwork.libcamera.org/patch/15846/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220510115147.19360-7-laurent.pinchart@ideasonboard.com>","date":"2022-05-10T11:51:03","name":"[libcamera-devel,06/50] staging: media: imx: imx7-media-csi: Move misc init out of probe()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"46c474902259f22d2324fe64da495cdbbea2b2bd","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15846/mbox/","series":[{"id":3106,"url":"https://patchwork.libcamera.org/api/series/3106/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3106","date":"2022-05-10T11:50:57","name":"staging: media: imx: Prepare destaging of imx7-media-csi","version":1,"mbox":"https://patchwork.libcamera.org/series/3106/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15846/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15846/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 0EE00C326D\n\tfor ;\n\tTue, 10 May 2022 11:52:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9AB116565A;\n\tTue, 10 May 2022 13:52:05 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 157446564D\n\tfor ;\n\tTue, 10 May 2022 13:52:02 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 122E4824;\n\tTue, 10 May 2022 13:52:01 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652183525;\n\tbh=g1HSzGVKOFmiTz3acZlXrvGDr9k5S9lpIAwIEIkpp9E=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=o8fyufMT51Hy+4R4NINI8E5lVOnNqHkRrFltefxA/GcWWhLuqj+QDw4+PN3vOPB4k\n\tF8a7VaDxbwaH1qSQkoCtebkFOpnfHjefQKlSWj3+BKPVCHql/7elZRXtP/NSRXV8e4\n\tbUscnxIY2dLCGiKhTzr8nWeKaTtUODtwmsUt6MmBPgJyqBe+j/8sEzVPctx9eV6T4N\n\tnt8/g/0XGn7+qVNEcedp1yAYr5qiWn0hM+o44W7UXMsIKAxEsWv0wQhPX58M9czGip\n\tUzEfhVlF9+FhKs60UxMMPGsjc+TX4YmvVrTiyeckmjwTDa2bXau1RKDd2x6VYJzpYU\n\tqIQvEJkeCMt0Q==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652183521;\n\tbh=g1HSzGVKOFmiTz3acZlXrvGDr9k5S9lpIAwIEIkpp9E=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=eEPBhNTvBK+STHKodI7N+UoAIQx2E542gSGao25WdDtAXYia5YOG7z69wH2PaIXJw\n\tvvV2Qi34nkU4/IEtvQDTBUP0YGEJFHGIcVrJ53N1sSjFRG1fu8hcNzigFBP3nD83sb\n\tU2ZbXcuLbQvIqsYn1+a3ArWsFWA/Gw/FQbcem5nc="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"eEPBhNTv\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 10 May 2022 14:51:03 +0300","Message-Id":"<20220510115147.19360-7-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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 06/50] staging: media: imx:\n\timx7-media-csi: Move misc init out of probe()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"Martin Kepplinger , kernel@pengutronix.de,\n\tDorota Czaplejewicz ,\n\tAlexander Stein ,\n\tRui Miguel Silva ,\n\tPhilipp Zabel , \n\tSteve Longerbeam ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Paul Elder \n\nThere is a chunk of miscellaneous initializations related to the CSI\nsubdev and media pads directly in the probe function. Move them into the\nimx7_csi_media_init() function to clean up the probe function.\n\nSigned-off-by: Paul Elder \n---\n drivers/staging/media/imx/imx7-media-csi.c | 49 +++++++++++-----------\n 1 file changed, 24 insertions(+), 25 deletions(-)","diff":"diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c\nindex 984f7bec15af..042dd4c0cb4d 100644\n--- a/drivers/staging/media/imx/imx7-media-csi.c\n+++ b/drivers/staging/media/imx/imx7-media-csi.c\n@@ -1342,7 +1342,7 @@ static void imx7_csi_media_cleanup(struct imx7_csi *csi)\n static int imx7_csi_media_init(struct imx7_csi *csi)\n {\n \tstruct imx_media_dev *imxmd;\n-\tint ret;\n+\tint i, ret;\n \n \t/* add media device */\n \timxmd = imx_media_dev_init(csi->dev, NULL);\n@@ -1357,14 +1357,33 @@ static int imx7_csi_media_init(struct imx7_csi *csi)\n \n \tcsi->imxmd = imxmd;\n \n-\treturn 0;\n+\tv4l2_subdev_init(&csi->sd, &imx7_csi_subdev_ops);\n+\tv4l2_set_subdevdata(&csi->sd, csi);\n+\tcsi->sd.internal_ops = &imx7_csi_internal_ops;\n+\tcsi->sd.entity.ops = &imx7_csi_entity_ops;\n+\tcsi->sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;\n+\tcsi->sd.dev = csi->dev;\n+\tcsi->sd.owner = THIS_MODULE;\n+\tcsi->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;\n+\tsnprintf(csi->sd.name, sizeof(csi->sd.name), \"csi\");\n+\n+\tfor (i = 0; i < IMX7_CSI_PADS_NUM; i++)\n+\t\tcsi->pad[i].flags = (i == IMX7_CSI_PAD_SINK) ?\n+\t\t\tMEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;\n+\n+\tret = media_entity_pads_init(&csi->sd.entity, IMX7_CSI_PADS_NUM,\n+\t\t\t\t csi->pad);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\treturn v4l2_device_register_subdev(&csi->imxmd->v4l2_dev, &csi->sd);\n }\n \n static int imx7_csi_probe(struct platform_device *pdev)\n {\n \tstruct device *dev = &pdev->dev;\n \tstruct imx7_csi *csi;\n-\tint i, ret;\n+\tint ret;\n \n \tcsi = devm_kzalloc(&pdev->dev, sizeof(*csi), GFP_KERNEL);\n \tif (!csi)\n@@ -1410,28 +1429,9 @@ static int imx7_csi_probe(struct platform_device *pdev)\n \tif (ret)\n \t\tgoto destroy_mutex;\n \n-\tv4l2_subdev_init(&csi->sd, &imx7_csi_subdev_ops);\n-\tv4l2_set_subdevdata(&csi->sd, csi);\n-\tcsi->sd.internal_ops = &imx7_csi_internal_ops;\n-\tcsi->sd.entity.ops = &imx7_csi_entity_ops;\n-\tcsi->sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;\n-\tcsi->sd.dev = &pdev->dev;\n-\tcsi->sd.owner = THIS_MODULE;\n-\tcsi->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;\n-\tsnprintf(csi->sd.name, sizeof(csi->sd.name), \"csi\");\n-\n-\tfor (i = 0; i < IMX7_CSI_PADS_NUM; i++)\n-\t\tcsi->pad[i].flags = (i == IMX7_CSI_PAD_SINK) ?\n-\t\t\tMEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;\n-\n-\tret = media_entity_pads_init(&csi->sd.entity, IMX7_CSI_PADS_NUM,\n-\t\t\t\t csi->pad);\n-\tif (ret < 0)\n-\t\tgoto cleanup;\n-\n \tret = v4l2_device_register_subdev(&csi->imxmd->v4l2_dev, &csi->sd);\n \tif (ret)\n-\t\tgoto cleanup;\n+\t\tgoto media_cleanup;\n \n \tret = imx7_csi_async_register(csi);\n \tif (ret)\n@@ -1442,8 +1442,7 @@ static int imx7_csi_probe(struct platform_device *pdev)\n subdev_notifier_cleanup:\n \tv4l2_async_nf_unregister(&csi->notifier);\n \tv4l2_async_nf_cleanup(&csi->notifier);\n-\n-cleanup:\n+media_cleanup:\n \timx7_csi_media_cleanup(csi);\n \n destroy_mutex:\n","prefixes":["libcamera-devel","06/50"]}