[{"id":35830,"web_url":"https://patchwork.libcamera.org/comment/35830/","msgid":"<175794765544.653594.365805208570672726@localhost>","date":"2025-09-15T14:47:35","subject":"Re: [PATCH 3/3] libcamera: v4l2: Remove fromEntityName(MediaDevice*)","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nQuoting Paul Elder (2025-04-04 09:46:23)\n> From: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> Now that all users of the fromEntityName() helpers use the shared_ptr\n> variant, remove the original functions that are no longer used.\n> \n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\nReviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>\n\nBest regards,\nStefan\n\n> ---\n>  include/libcamera/internal/v4l2_subdevice.h   |  2 --\n>  include/libcamera/internal/v4l2_videodevice.h |  2 --\n>  src/libcamera/v4l2_subdevice.cpp              | 17 +----------------\n>  src/libcamera/v4l2_videodevice.cpp            | 17 +----------------\n>  4 files changed, 2 insertions(+), 36 deletions(-)\n> \n> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\n> index 08216cd56bc3..1ad21fdc6a27 100644\n> --- a/include/libcamera/internal/v4l2_subdevice.h\n> +++ b/include/libcamera/internal/v4l2_subdevice.h\n> @@ -161,8 +161,6 @@ public:\n>         const std::string &model();\n>         const V4L2SubdeviceCapability &caps() const { return caps_; }\n>  \n> -       static std::unique_ptr<V4L2Subdevice>\n> -       fromEntityName(const MediaDevice *media, const std::string &entity);\n>         static std::unique_ptr<V4L2Subdevice>\n>         fromEntityName(std::shared_ptr<const MediaDevice>, const std::string &entity);\n>  \n> diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\n> index e35fb11bc99f..640990e279e2 100644\n> --- a/include/libcamera/internal/v4l2_videodevice.h\n> +++ b/include/libcamera/internal/v4l2_videodevice.h\n> @@ -226,8 +226,6 @@ public:\n>         void setDequeueTimeout(utils::Duration timeout);\n>         Signal<> dequeueTimeout;\n>  \n> -       static std::unique_ptr<V4L2VideoDevice>\n> -       fromEntityName(const MediaDevice *media, const std::string &entity);\n>         static std::unique_ptr<V4L2VideoDevice>\n>         fromEntityName(std::shared_ptr<const MediaDevice>, const std::string &entity);\n>  \n> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> index 13f5316a3fc3..305a1b0f1bae 100644\n> --- a/src/libcamera/v4l2_subdevice.cpp\n> +++ b/src/libcamera/v4l2_subdevice.cpp\n> @@ -1756,7 +1756,7 @@ const std::string &V4L2Subdevice::model()\n>   * \\return A newly created V4L2Subdevice on success, nullptr otherwise\n>   */\n>  std::unique_ptr<V4L2Subdevice>\n> -V4L2Subdevice::fromEntityName(const MediaDevice *media,\n> +V4L2Subdevice::fromEntityName(std::shared_ptr<const MediaDevice> media,\n>                               const std::string &entity)\n>  {\n>         MediaEntity *mediaEntity = media->getEntityByName(entity);\n> @@ -1766,21 +1766,6 @@ V4L2Subdevice::fromEntityName(const MediaDevice *media,\n>         return std::make_unique<V4L2Subdevice>(mediaEntity);\n>  }\n>  \n> -/**\n> - * \\brief Create a new video subdevice instance from \\a entity in media device\n> - * \\a media\n> - * \\param[in] media The media device where the entity is registered\n> - * \\param[in] entity The media entity name\n> - *\n> - * \\return A newly created V4L2Subdevice on success, nullptr otherwise\n> - */\n> -std::unique_ptr<V4L2Subdevice>\n> -V4L2Subdevice::fromEntityName(std::shared_ptr<const MediaDevice> media,\n> -                             const std::string &entity)\n> -{\n> -       return fromEntityName(media.get(), entity);\n> -}\n> -\n>  std::string V4L2Subdevice::logPrefix() const\n>  {\n>         return \"'\" + entity_->name() + \"'\";\n> diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\n> index ce7be7deb91f..9769243de8cc 100644\n> --- a/src/libcamera/v4l2_videodevice.cpp\n> +++ b/src/libcamera/v4l2_videodevice.cpp\n> @@ -2099,7 +2099,7 @@ void V4L2VideoDevice::watchdogExpired()\n>   * \\return A newly created V4L2VideoDevice on success, nullptr otherwise\n>   */\n>  std::unique_ptr<V4L2VideoDevice>\n> -V4L2VideoDevice::fromEntityName(const MediaDevice *media,\n> +V4L2VideoDevice::fromEntityName(std::shared_ptr<const MediaDevice> media,\n>                                 const std::string &entity)\n>  {\n>         MediaEntity *mediaEntity = media->getEntityByName(entity);\n> @@ -2109,21 +2109,6 @@ V4L2VideoDevice::fromEntityName(const MediaDevice *media,\n>         return std::make_unique<V4L2VideoDevice>(mediaEntity);\n>  }\n>  \n> -/**\n> - * \\brief Create a new video device instance from \\a entity in media device\n> - * \\a media\n> - * \\param[in] media The media device where the entity is registered\n> - * \\param[in] entity The media entity name\n> - *\n> - * \\return A newly created V4L2VideoDevice on success, nullptr otherwise\n> - */\n> -std::unique_ptr<V4L2VideoDevice>\n> -V4L2VideoDevice::fromEntityName(std::shared_ptr<const MediaDevice> media,\n> -                               const std::string &entity)\n> -{\n> -       return fromEntityName(media.get(), entity);\n> -}\n> -\n>  /**\n>   * \\brief Convert \\a PixelFormat to a V4L2PixelFormat supported by the device\n>   * \\param[in] pixelFormat The PixelFormat to convert\n> -- \n> 2.47.2\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 13A4ABE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 15 Sep 2025 14:47:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 072236936F;\n\tMon, 15 Sep 2025 16:47:39 +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 AFDFA613A0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 15 Sep 2025 16:47:38 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:2a47:b7e5:c39c:d1b3])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id CF5468D4;\n\tMon, 15 Sep 2025 16:46:20 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"tTFALU8/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1757947580;\n\tbh=6sfJmfjgyGXWjToQepZmf8gMGB7x4zKhZBToH8uObRE=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=tTFALU8/LGcJUgGwroWQ4zx4ndK1XkWrk4a6nbLGQDtX2TR4nXZdl3GBvegBS9p4B\n\tRqCYYyIiDPPSNUXkQueIAVcWuG3hnpbiM42yVuM5/r/jliunhsZyOlkdhgML155mNi\n\tlK6GnD+cikYNthu6lb5+e1mfiLg8dMMFGnCGQeKo=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20250404074624.2975182-4-paul.elder@ideasonboard.com>","References":"<20250404074624.2975182-1-paul.elder@ideasonboard.com>\n\t<20250404074624.2975182-4-paul.elder@ideasonboard.com>","Subject":"Re: [PATCH 3/3] libcamera: v4l2: Remove fromEntityName(MediaDevice*)","From":"Stefan Klug <stefan.klug@ideasonboard.com>","Cc":"Kieran Bingham <kieran.bingham@ideasonboard.com>,\n\tPaul Elder <paul.elder@ideasonboard.com>","To":"Paul Elder <paul.elder@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 15 Sep 2025 16:47:35 +0200","Message-ID":"<175794765544.653594.365805208570672726@localhost>","User-Agent":"alot/0.12.dev8+g2c003385c862.d20250602","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]