{"id":15859,"url":"https://patchwork.libcamera.org/api/1.1/patches/15859/?format=json","web_url":"https://patchwork.libcamera.org/patch/15859/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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-20-laurent.pinchart@ideasonboard.com>","date":"2022-05-10T11:51:16","name":"[libcamera-devel,19/50] staging: media: imx: imx7-media-csi: Embed imx_media_dev in imx7_csi","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"40885072fbe7d1f31f202077f010ca50befb7cf2","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15859/mbox/","series":[{"id":3106,"url":"https://patchwork.libcamera.org/api/1.1/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/15859/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15859/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 4F55AC326C\n\tfor ;\n\tTue, 10 May 2022 11:52:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C365A65680;\n\tTue, 10 May 2022 13:52:22 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6B4DC6567B\n\tfor ;\n\tTue, 10 May 2022 13:52:13 +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 8ADC7BA9;\n\tTue, 10 May 2022 13:52:12 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1652183543;\n\tbh=FKgYb9k2bmI3Tpr/aEtWZrnecOgXRroi+h/FsMN2epw=;\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=uuRxqWTUUxMoOXa+dIhMZ4VnSaxCrqBC9q3Pmzehub3phhbRIGHuNVatnBKAQnSAD\n\tahFaZtaeBjpQTvWTZ2xmVLDIw5yMF3i9bC2jLEkLlpa8ANbAQaZ4A2UkkMKSRhRoW9\n\tJJ8MDxTSrDwDtmyaudNTYDiAm5h9QNaHMBczXZcUc3cG/f6xtIasWNfrgYk2h1d5We\n\tcKgRqoaz+srpTzyU/l//yPVyVoDAZEPCSoI2i/gXxdILLx4DHfi4DhX00o+I1TSYSX\n\t8yQZ1gENU7k8ryhMMfPDSwQsL86B3GouKFo3BahSZbokSlZTnlI58liCsSwCElVe/Q\n\t5r8OpDCWOn96w==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1652183533;\n\tbh=FKgYb9k2bmI3Tpr/aEtWZrnecOgXRroi+h/FsMN2epw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=lCKXJM6FDBtSzT2IACeI65tlA97JtXZOjUrbl+MiDSMx9kN8l1qsIMDP50EYtTGZU\n\tt4/2nBNPJ/XTtkKDZj1Yj3YplMAjWgWqj5TFjydMdUKgT4ZepKVnlqziRBkQsKY3/5\n\tknoAiF//6phvHYSzS96At6XE3K46V0/HoCFaDDW0="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"lCKXJM6F\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 10 May 2022 14:51:16 +0300","Message-Id":"<20220510115147.19360-20-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 19/50] staging: media: imx:\n\timx7-media-csi: Embed imx_media_dev in imx7_csi","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":"There's no need anymore to allocate the imx_media_dev structure\nseparately from imx7_csi. Embed it.\n\nSigned-off-by: Laurent Pinchart \n---\n drivers/staging/media/imx/imx7-media-csi.c | 47 +++++++++-------------\n 1 file changed, 20 insertions(+), 27 deletions(-)","diff":"diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c\nindex 8b19792adfc6..891e939d7ea5 100644\n--- a/drivers/staging/media/imx/imx7-media-csi.c\n+++ b/drivers/staging/media/imx/imx7-media-csi.c\n@@ -183,7 +183,7 @@ struct imx7_csi {\n \tspinlock_t irqlock; /* Protects last_eof */\n \n \t/* Media and V4L2 device */\n-\tstruct imx_media_dev *imxmd;\n+\tstruct imx_media_dev imxmd;\n \tstruct v4l2_async_notifier notifier;\n \n \tstruct v4l2_subdev *src_sd;\n@@ -1081,7 +1081,7 @@ static int imx7_csi_video_start_streaming(struct vb2_queue *vq,\n \t\tgoto return_bufs;\n \t}\n \n-\tret = imx_media_pipeline_set_stream(csi->imxmd, &csi->sd.entity, true);\n+\tret = imx_media_pipeline_set_stream(&csi->imxmd, &csi->sd.entity, true);\n \tif (ret) {\n \t\tdev_err(csi->dev, \"pipeline start failed with %d\\n\", ret);\n \t\tgoto return_bufs;\n@@ -1107,7 +1107,7 @@ static void imx7_csi_video_stop_streaming(struct vb2_queue *vq)\n \tunsigned long flags;\n \tint ret;\n \n-\tret = imx_media_pipeline_set_stream(csi->imxmd, &csi->sd.entity, false);\n+\tret = imx_media_pipeline_set_stream(&csi->imxmd, &csi->sd.entity, false);\n \tif (ret)\n \t\tdev_warn(csi->dev, \"pipeline stop failed with %d\\n\", ret);\n \n@@ -1268,7 +1268,7 @@ static int imx7_csi_video_register(struct imx7_csi *csi)\n \t}\n \n \t/* Add vdev to the video devices list. */\n-\timx_media_add_video_device(csi->imxmd, &csi->vdev);\n+\timx_media_add_video_device(&csi->imxmd, &csi->vdev);\n \n \treturn 0;\n }\n@@ -1685,11 +1685,11 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)\n \tif (ret)\n \t\treturn ret;\n \n-\tret = v4l2_device_register_subdev_nodes(&csi->imxmd->v4l2_dev);\n+\tret = v4l2_device_register_subdev_nodes(&csi->imxmd.v4l2_dev);\n \tif (ret)\n \t\tgoto err_unreg;\n \n-\tret = media_device_register(&csi->imxmd->md);\n+\tret = media_device_register(&csi->imxmd.md);\n \tif (ret)\n \t\tgoto err_unreg;\n \n@@ -1759,7 +1759,7 @@ static int imx7_csi_notify_complete(struct v4l2_async_notifier *notifier)\n {\n \tstruct imx7_csi *csi = imx7_csi_notifier_to_dev(notifier);\n \n-\treturn v4l2_device_register_subdev_nodes(&csi->imxmd->v4l2_dev);\n+\treturn v4l2_device_register_subdev_nodes(&csi->imxmd.v4l2_dev);\n }\n \n static const struct v4l2_async_notifier_operations imx7_csi_notify_ops = {\n@@ -1793,7 +1793,7 @@ static int imx7_csi_async_register(struct imx7_csi *csi)\n \n \tcsi->notifier.ops = &imx7_csi_notify_ops;\n \n-\tret = v4l2_async_nf_register(&csi->imxmd->v4l2_dev, &csi->notifier);\n+\tret = v4l2_async_nf_register(&csi->imxmd.v4l2_dev, &csi->notifier);\n \tif (ret)\n \t\treturn ret;\n \n@@ -1802,7 +1802,7 @@ static int imx7_csi_async_register(struct imx7_csi *csi)\n \n static void imx7_csi_media_cleanup(struct imx7_csi *csi)\n {\n-\tstruct imx_media_dev *imxmd = csi->imxmd;\n+\tstruct imx_media_dev *imxmd = &csi->imxmd;\n \n \tv4l2_device_unregister(&imxmd->v4l2_dev);\n \tmedia_device_unregister(&imxmd->md);\n@@ -1813,20 +1813,16 @@ static const struct media_device_ops imx7_csi_media_ops = {\n \t.link_notify = v4l2_pipeline_link_notify,\n };\n \n-static struct imx_media_dev *imx7_csi_media_dev_init(struct device *dev)\n+static int imx7_csi_media_dev_init(struct imx7_csi *csi)\n {\n-\tstruct imx_media_dev *imxmd;\n+\tstruct imx_media_dev *imxmd = &csi->imxmd;\n \tint ret;\n \n-\timxmd = devm_kzalloc(dev, sizeof(*imxmd), GFP_KERNEL);\n-\tif (!imxmd)\n-\t\treturn ERR_PTR(-ENOMEM);\n-\n-\tdev_set_drvdata(dev, imxmd);\n+\tdev_set_drvdata(csi->dev, imxmd);\n \n \tstrscpy(imxmd->md.model, \"imx-media\", sizeof(imxmd->md.model));\n \timxmd->md.ops = &imx7_csi_media_ops;\n-\timxmd->md.dev = dev;\n+\timxmd->md.dev = csi->dev;\n \n \tmutex_init(&imxmd->mutex);\n \n@@ -1838,7 +1834,7 @@ static struct imx_media_dev *imx7_csi_media_dev_init(struct device *dev)\n \n \tmedia_device_init(&imxmd->md);\n \n-\tret = v4l2_device_register(dev, &imxmd->v4l2_dev);\n+\tret = v4l2_device_register(csi->dev, &imxmd->v4l2_dev);\n \tif (ret < 0) {\n \t\tv4l2_err(&imxmd->v4l2_dev,\n \t\t\t \"Failed to register v4l2_device: %d\\n\", ret);\n@@ -1849,25 +1845,22 @@ static struct imx_media_dev *imx7_csi_media_dev_init(struct device *dev)\n \n \tv4l2_async_nf_init(&imxmd->notifier);\n \n-\treturn imxmd;\n+\treturn 0;\n \n cleanup:\n \tmedia_device_cleanup(&imxmd->md);\n \n-\treturn ERR_PTR(ret);\n+\treturn ret;\n }\n \n static int imx7_csi_media_init(struct imx7_csi *csi)\n {\n-\tstruct imx_media_dev *imxmd;\n \tint i, ret;\n \n \t/* add media device */\n-\timxmd = imx7_csi_media_dev_init(csi->dev);\n-\tif (IS_ERR(imxmd))\n-\t\treturn PTR_ERR(imxmd);\n-\n-\tcsi->imxmd = imxmd;\n+\tret = imx7_csi_media_dev_init(csi);\n+\tif (ret)\n+\t\treturn ret;\n \n \tv4l2_subdev_init(&csi->sd, &imx7_csi_subdev_ops);\n \tv4l2_set_subdevdata(&csi->sd, csi);\n@@ -1888,7 +1881,7 @@ static int imx7_csi_media_init(struct imx7_csi *csi)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\treturn v4l2_device_register_subdev(&csi->imxmd->v4l2_dev, &csi->sd);\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","prefixes":["libcamera-devel","19/50"]}