From patchwork Sun Jan 12 01:01:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 2594 Return-Path: Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7CB38606D6 for ; Sun, 12 Jan 2020 02:03:08 +0100 (CET) X-Halon-ID: 498fef40-34d7-11ea-b6d8-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p54ac5d7b.dip0.t-ipconnect.de [84.172.93.123]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 498fef40-34d7-11ea-b6d8-005056917f90; Sun, 12 Jan 2020 02:03:04 +0100 (CET) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Sun, 12 Jan 2020 02:01:52 +0100 Message-Id: <20200112010212.2609025-13-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200112010212.2609025-1-niklas.soderlund@ragnatech.se> References: <20200112010212.2609025-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 12/32] libcamera: buffer: Drop private function setRequest() 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-List-Received-Date: Sun, 12 Jan 2020 01:03:08 -0000 There is no need to have a private helper function to access a private data member when a friend statement is needed anyhow. Remove the helper function to simplify the code and make it clear that a private member of Buffer is accessed. Signed-off-by: Niklas Söderlund Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- include/libcamera/buffer.h | 2 -- src/libcamera/buffer.cpp | 8 ++++---- src/libcamera/request.cpp | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/libcamera/buffer.h b/include/libcamera/buffer.h index d3dc9a420aaaa385..55d08e278a7d0236 100644 --- a/include/libcamera/buffer.h +++ b/include/libcamera/buffer.h @@ -129,8 +129,6 @@ private: void cancel(); - void setRequest(Request *request) { request_ = request; } - unsigned int index_; std::array dmabuf_; BufferMemory *mem_; diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp index d53e5150b40a3b09..8c8be4ac802735b1 100644 --- a/src/libcamera/buffer.cpp +++ b/src/libcamera/buffer.cpp @@ -290,7 +290,6 @@ Buffer::Buffer(unsigned int index, const Buffer *metadata) * * \return The Request the Buffer belongs to, or nullptr if the buffer is * either completed or not associated with a request - * \sa Buffer::setRequest() */ /** @@ -318,10 +317,11 @@ void Buffer::cancel() } /** - * \fn Buffer::setRequest() - * \brief Set the request this buffer belongs to + * \var Buffer::request_ + * \brief The request this buffer belongs to * - * The intended callers are Request::addBuffer() and Request::completeBuffer(). + * This member is intended to be set by Request::addBuffer() and + * Request::completeBuffer(). */ /** diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 84a5f55879ccf5b5..92330c1a37290fc2 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -139,7 +139,7 @@ int Request::addBuffer(std::unique_ptr buffer) return -EEXIST; } - buffer->setRequest(this); + buffer->request_ = this; pending_.insert(buffer.get()); bufferMap_[stream] = buffer.release(); @@ -236,7 +236,7 @@ bool Request::completeBuffer(Buffer *buffer) int ret = pending_.erase(buffer); ASSERT(ret == 1); - buffer->setRequest(nullptr); + buffer->request_ = nullptr; if (buffer->status() == Buffer::BufferCancelled) cancelled_ = true;