From patchwork Wed Jan 2 12:02:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 133 Return-Path: Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C595A60B0C for ; Wed, 2 Jan 2019 13:02:56 +0100 (CET) X-Originating-IP: 2.224.242.101 Received: from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 5B21BC0007; Wed, 2 Jan 2019 12:02:56 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Wed, 2 Jan 2019 13:02:55 +0100 Message-Id: <20190102120256.7769-1-jacopo@jmondi.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] libcamera: media_device: Minor cleanup in findInterface() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jan 2019 12:02:56 -0000 Do not compare an usigned int with -1 to avoid going through cast. Also align function parameters and long assignement lines while at there. Signed-off-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- src/libcamera/media_device.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index 4ff9ffe..34206c8 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -379,13 +379,14 @@ void MediaDevice::clear() * \return A pointer to the interface if found, or nullptr otherwise */ struct media_v2_interface *MediaDevice::findInterface(const struct media_v2_topology &topology, - unsigned int entityId) + unsigned int entityId) { struct media_v2_link *links = reinterpret_cast - (topology.ptr_links); - unsigned int ifaceId = -1; + (topology.ptr_links); + unsigned int ifaceId; + unsigned int i; - for (unsigned int i = 0; i < topology.num_links; ++i) { + for (i = 0; i < topology.num_links; ++i) { /* Search for the interface to entity link. */ if (links[i].sink_id != entityId) continue; @@ -397,14 +398,12 @@ struct media_v2_interface *MediaDevice::findInterface(const struct media_v2_topo ifaceId = links[i].source_id; break; } - - if (ifaceId == static_cast(-1)) + if (i == topology.num_links) return nullptr; struct media_v2_interface *ifaces = reinterpret_cast - (topology.ptr_interfaces); - - for (unsigned int i = 0; i < topology.num_interfaces; ++i) { + (topology.ptr_interfaces); + for (i = 0; i < topology.num_interfaces; ++i) { if (ifaces[i].id == ifaceId) return &ifaces[i]; }