From patchwork Thu Feb 14 20:19:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10813737 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 5CECE1399 for ; Thu, 14 Feb 2019 20:24:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D1112EAF1 for ; Thu, 14 Feb 2019 20:24:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 41EB12EB62; Thu, 14 Feb 2019 20:24:34 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E894A2EAF1 for ; Thu, 14 Feb 2019 20:24:33 +0000 (UTC) Received: from localhost ([127.0.0.1]:54542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guNYf-0003M9-7Z for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Feb 2019 15:24:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guNV4-0000aR-Sg for qemu-devel@nongnu.org; Thu, 14 Feb 2019 15:20:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guNV2-000614-FJ for qemu-devel@nongnu.org; Thu, 14 Feb 2019 15:20:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1guNUx-0005ce-H1 for qemu-devel@nongnu.org; Thu, 14 Feb 2019 15:20:45 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C6AEB4B8A; Thu, 14 Feb 2019 20:20:22 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-144.brq.redhat.com [10.40.204.144]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4771419C65; Thu, 14 Feb 2019 20:20:19 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Prasad J Pandit , =?utf-8?q?Marc-Andr=C3=A9_Lurea?= =?utf-8?q?u?= , qemu-devel@nongnu.org, Paolo Bonzini Date: Thu, 14 Feb 2019 21:19:36 +0100 Message-Id: <20190214201939.494-7-philmd@redhat.com> In-Reply-To: <20190214201939.494-1-philmd@redhat.com> References: <20190214201939.494-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 14 Feb 2019 20:20:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 6/9] ccid-card-passthru: Simplify the if() condition X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Simplify the if() condition so we can remove an indent layer and the code is easier to review. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau --- hw/usb/ccid-card-passthru.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index ccc3ffa7fa..6cb8b2d26b 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -338,19 +338,17 @@ static void passthru_realize(CCIDCardState *base, Error **errp) { PassthruState *card = PASSTHRU_CCID_CARD(base); - card->vscard_in_pos = 0; - card->vscard_in_hdr = 0; - if (qemu_chr_fe_backend_connected(&card->cs)) { - DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev"); - qemu_chr_fe_set_handlers(&card->cs, - ccid_card_vscard_can_read, - ccid_card_vscard_read, - ccid_card_vscard_event, NULL, card, NULL, true); - ccid_card_vscard_send_init(card); - } else { + if (!qemu_chr_fe_backend_connected(&card->cs)) { error_setg(errp, "missing chardev"); return; } + card->vscard_in_pos = 0; + card->vscard_in_hdr = 0; + DPRINTF(card, D_INFO, "ccid-card-passthru: initing chardev"); + qemu_chr_fe_set_handlers(&card->cs, ccid_card_vscard_can_read, + ccid_card_vscard_read, ccid_card_vscard_event, + NULL, card, NULL, true); + ccid_card_vscard_send_init(card); card->debug = parse_debug_env("QEMU_CCID_PASSTHRU_DEBUG", D_VERBOSE, card->debug); memcpy(card->atr, DEFAULT_ATR, sizeof(DEFAULT_ATR));