From patchwork Wed Nov 14 12:59:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Saenz Julienne X-Patchwork-Id: 10682541 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 49C9E139B for ; Wed, 14 Nov 2018 13:06:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 386E028BEE for ; Wed, 14 Nov 2018 13:06:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 295242B0BB; Wed, 14 Nov 2018 13:06:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D3DA328BEE for ; Wed, 14 Nov 2018 13:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YJvciiXozJPtO6A4Ax3rxthJwWlVj/eicEXYj9Z76h8=; b=jN5T4Vys0m1WbH jMchKUrHaPJNJK8tntij9tq8TMkSU0ctwSxP/TLTdaH/uQYIhFatyASM+Ap8i9yqcKKxqrFiPtrbw 9MG+0+Z7NbTIhVRdttiDPpzi+u29dV6e8EeO42Nj3cfJ3rNvoyJKX383h+uHCWDBZB+ozv9IN04wI YYg43Yi3ZC9rmLyB5Yj6HGNvkbp1ZZ8AAH74C73g5Mu/orv4iL+nM+nChYL2Pio53sOdokjC3yZyY c9Jo6R2LpLpIBL00wiCD+OX2DNl78uvdrV3UsI1IWqwUFwAEPYDrfyZ2cPPaBUP8yY8vnkYuobvL7 GdHsVd5ZikeC9LTYhIYw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMurx-0005ky-OW; Wed, 14 Nov 2018 13:06:09 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMums-0008PA-0c; Wed, 14 Nov 2018 13:00:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=tqSP5Nd8JdEhkcKobw8tFrIgcv3MIKJBnQDXLak7TPI=; b=kVTb6EcAEVI04Gap9SCQhwJ5yZ wuRxNFmea3Gxu8M/Uhuz72iZJxpTZAInH8kQYhrrOpG0kJ0F0FogUMbHBv8zjIkzyY+UAX0JcUs29 aPAH2UNsQTNUbG08XD18ksEp/SYZsOpa5UPwVWOl31SLc8rGB7TePBcJjSZgMhVccAX9/cBO8nzMg aG4xjZ5bQGWpZweEy19gjUQ9hBzPdO2l9RseHIU1qiYKXub/X+YircBnDOTtMiw5tz0FosngU5Ipl boU2uuv/znl3RCi2U14TNLZTGUtqd8ukB4j1u77WPzfoA4MzS/13yWDhBqRuSFZq4EFQO0axVe4Eq uomZ88SQ==; Received: from mx2.suse.de ([195.135.220.15] helo=mx1.suse.de) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMumk-0004qc-Eu; Wed, 14 Nov 2018 13:00:52 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 69815B0F5; Wed, 14 Nov 2018 13:00:23 +0000 (UTC) From: Nicolas Saenz Julienne To: stefan.wahren@i2se.com, eric@anholt.net, dave.stevenson@raspberrypi.org Subject: [PATCH 13/16] staging: vchiq_core: fix logic redundancy in parse_open Date: Wed, 14 Nov 2018 13:59:39 +0100 Message-Id: <20181114125942.25163-14-nsaenzjulienne@suse.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114125942.25163-1-nsaenzjulienne@suse.de> References: <20181114125942.25163-1-nsaenzjulienne@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181114_130046_560560_BF7FCC22 X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Nicolas Saenz Julienne , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We update sync to reflect that the firmware version is compatible with that option. We don't need to check both of them again further down the code. Signed-off-by: Nicolas Saenz Julienne --- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c index a45cdd08e209..5ee667d46eb5 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -1461,9 +1461,7 @@ parse_open(VCHIQ_STATE_T *state, VCHIQ_HEADER_T *header) service->sync = 0; /* Acknowledge the OPEN */ - if (service->sync && - (state->version_common >= - VCHIQ_VERSION_SYNCHRONOUS_MODE)) { + if (service->sync) { if (queue_message_sync( state, NULL,