From patchwork Fri Apr 4 07:46:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 23137 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 393CBC3213 for ; Fri, 4 Apr 2025 07:46:45 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E13F668994; Fri, 4 Apr 2025 09:46:44 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="k3luEyQy"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 60D70689A7 for ; Fri, 4 Apr 2025 09:46:40 +0200 (CEST) Received: from neptunite.flets-east.jp (unknown [IPv6:2404:7a81:160:2100:cd45:d129:c842:b4ce]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 009A8E7C; Fri, 4 Apr 2025 09:44:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1743752686; bh=93RY5jnnnjYjjAm+2P+LXmX/6tBKmI3TYg5wKctvC+4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k3luEyQyP1JuX68lQuvxU05NTOA0MOlzcwOCej0ZEzAW4iaUQq3vDoa4oqMDtpfxq 5pxdBQaUQbCB+BLm3cLiPyIgBAFqqAPn6lncpP95Rkdxd0D+YhtAk5Knlixyw8JF7c D08vK4L80XCK47pMPn4d3zDAOVDbBcGOhHv9wpuE= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Kieran Bingham , Paul Elder Subject: [PATCH 3/3] libcamera: v4l2: Remove fromEntityName(MediaDevice*) Date: Fri, 4 Apr 2025 16:46:23 +0900 Message-ID: <20250404074624.2975182-4-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250404074624.2975182-1-paul.elder@ideasonboard.com> References: <20250404074624.2975182-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Kieran Bingham Now that all users of the fromEntityName() helpers use the shared_ptr variant, remove the original functions that are no longer used. Signed-off-by: Kieran Bingham Signed-off-by: Paul Elder --- include/libcamera/internal/v4l2_subdevice.h | 2 -- include/libcamera/internal/v4l2_videodevice.h | 2 -- src/libcamera/v4l2_subdevice.cpp | 17 +---------------- src/libcamera/v4l2_videodevice.cpp | 17 +---------------- 4 files changed, 2 insertions(+), 36 deletions(-) diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h index 08216cd56bc3..1ad21fdc6a27 100644 --- a/include/libcamera/internal/v4l2_subdevice.h +++ b/include/libcamera/internal/v4l2_subdevice.h @@ -161,8 +161,6 @@ public: const std::string &model(); const V4L2SubdeviceCapability &caps() const { return caps_; } - static std::unique_ptr - fromEntityName(const MediaDevice *media, const std::string &entity); static std::unique_ptr fromEntityName(std::shared_ptr, const std::string &entity); diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h index e35fb11bc99f..640990e279e2 100644 --- a/include/libcamera/internal/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -226,8 +226,6 @@ public: void setDequeueTimeout(utils::Duration timeout); Signal<> dequeueTimeout; - static std::unique_ptr - fromEntityName(const MediaDevice *media, const std::string &entity); static std::unique_ptr fromEntityName(std::shared_ptr, const std::string &entity); diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index 13f5316a3fc3..305a1b0f1bae 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -1756,7 +1756,7 @@ const std::string &V4L2Subdevice::model() * \return A newly created V4L2Subdevice on success, nullptr otherwise */ std::unique_ptr -V4L2Subdevice::fromEntityName(const MediaDevice *media, +V4L2Subdevice::fromEntityName(std::shared_ptr media, const std::string &entity) { MediaEntity *mediaEntity = media->getEntityByName(entity); @@ -1766,21 +1766,6 @@ V4L2Subdevice::fromEntityName(const MediaDevice *media, return std::make_unique(mediaEntity); } -/** - * \brief Create a new video subdevice instance from \a entity in media device - * \a media - * \param[in] media The media device where the entity is registered - * \param[in] entity The media entity name - * - * \return A newly created V4L2Subdevice on success, nullptr otherwise - */ -std::unique_ptr -V4L2Subdevice::fromEntityName(std::shared_ptr media, - const std::string &entity) -{ - return fromEntityName(media.get(), entity); -} - std::string V4L2Subdevice::logPrefix() const { return "'" + entity_->name() + "'"; diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index ce7be7deb91f..9769243de8cc 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -2099,7 +2099,7 @@ void V4L2VideoDevice::watchdogExpired() * \return A newly created V4L2VideoDevice on success, nullptr otherwise */ std::unique_ptr -V4L2VideoDevice::fromEntityName(const MediaDevice *media, +V4L2VideoDevice::fromEntityName(std::shared_ptr media, const std::string &entity) { MediaEntity *mediaEntity = media->getEntityByName(entity); @@ -2109,21 +2109,6 @@ V4L2VideoDevice::fromEntityName(const MediaDevice *media, return std::make_unique(mediaEntity); } -/** - * \brief Create a new video device instance from \a entity in media device - * \a media - * \param[in] media The media device where the entity is registered - * \param[in] entity The media entity name - * - * \return A newly created V4L2VideoDevice on success, nullptr otherwise - */ -std::unique_ptr -V4L2VideoDevice::fromEntityName(std::shared_ptr media, - const std::string &entity) -{ - return fromEntityName(media.get(), entity); -} - /** * \brief Convert \a PixelFormat to a V4L2PixelFormat supported by the device * \param[in] pixelFormat The PixelFormat to convert