From patchwork Thu Oct 13 20:21:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akanksha Srivastava X-Patchwork-Id: 681955 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sw2GW6zkxz9s9x for ; Fri, 14 Oct 2016 07:22:43 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=AL4l7N0x; dkim-atps=neutral Received: from localhost ([::1]:42814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bumWV-00080n-Sr for incoming@patchwork.ozlabs.org; Thu, 13 Oct 2016 16:22:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bumVq-0007iz-BI for qemu-devel@nongnu.org; Thu, 13 Oct 2016 16:21:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bumVk-0006UL-BZ for qemu-devel@nongnu.org; Thu, 13 Oct 2016 16:21:57 -0400 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:36459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bumVk-0006UB-0v; Thu, 13 Oct 2016 16:21:52 -0400 Received: by mail-pa0-x241.google.com with SMTP id os4so1118092pac.3; Thu, 13 Oct 2016 13:21:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=T7pIJo4yfFL0M0vwzMSJEibHwAWkIYNILwTo1j7hsmc=; b=AL4l7N0x1CVKVgEBISp32pk+os6b/9l1xuQAXjcXkCBQXg64q6Bgunf1VXzUtjoZoV /VDlLsywmKpgjGDn+xuO+kbuYzsx8pOEpetDOeK7azqNz62lBwifZkmCZ08+sg/NoNDX S8//wL8xlcg7pi3bqOYPeOf1cuNtYP4E8fCWXsPQ/6WQs8IYPpcg4/ikfTGuVnsDKpez v8hul/kpDgyrih39HZPHftRaE1zrMtKRrptAfYn/lxlzWUrTzihCMogSd90CHbuuJ/Ba KfnXh7FZjKvDQx7XcLYTX+jL9tyFVUPSEicQg4ztT39R8l/0A9QhjiffG411SjNcNgYu f7LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=T7pIJo4yfFL0M0vwzMSJEibHwAWkIYNILwTo1j7hsmc=; b=R+UKsYfdIcBhDZDTZdXUt5W0GoK+hgFwAEQgs3/nHp3NTWR4rrc5NqJq+FAgG82Qlh 3tATENuajvlgJwFFJk98pk0fxvTqZVhPNqSu5rgdyjCVo2FRpPGbvZTvyMIhA2bBhhod MEVoWCyUkDnh77kYX67kiNGgRh908WcAN3Pg5OpW2oMqWweYvgVo2CoN0eAIVC59uxke 4M4+ucyRPCyfP68LCXyXolLb8kuYZcKUGiVxnedWd4Rte9fWFyIhkt9B4PTzb4pzViyi lTODfRLyDGUD3D/BlOMDMuMMTHA8Hq/XSkmpSRkdr18DS7G0MueTxKQxSjgb1edxIxXa EsmA== X-Gm-Message-State: AA6/9RnRdPerCxEFukerWe+6UyrocD5rxYbyWykeWx9N0ky8XQYEiqv8M5dqtQqxxlugUA== X-Received: by 10.66.27.230 with SMTP id w6mr10503949pag.199.1476390111059; Thu, 13 Oct 2016 13:21:51 -0700 (PDT) Received: from akanksha.iiit.ac.in ([14.139.82.6]) by smtp.gmail.com with ESMTPSA id bx5sm21716514pad.6.2016.10.13.13.21.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Oct 2016 13:21:50 -0700 (PDT) From: Akanksha Srivastava To: qemu-devel@nongnu.org Date: Fri, 14 Oct 2016 01:51:31 +0530 Message-Id: <1476390091-6741-1-git-send-email-akanksha.dlf@gmail.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::241 Subject: [Qemu-devel] [PATCH v3] usb: Change *_exitfn return type from int to void 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: qemu-trivial@nongnu.org, kraxel@redhat.com, Akanksha Srivastava Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The *_exitfn functions cannot fail and should not be returning int. This also removes the passthru_exitfn since this callback does nothing as of now. This was suggested as a Bite-sized task for code cleanup. Signed-off-by: Akanksha Srivastava Reviewed-by: Stefan Hajnoczi --- hw/usb/ccid-card-emulated.c | 3 +-- hw/usb/ccid-card-passthru.c | 6 ------ hw/usb/ccid.h | 2 +- hw/usb/dev-smartcard-reader.c | 11 +++++------ 4 files changed, 7 insertions(+), 15 deletions(-) -- 1.9.1 diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 3213f9f..eceb5f3 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -547,7 +547,7 @@ static int emulated_initfn(CCIDCardState *base) return 0; } -static int emulated_exitfn(CCIDCardState *base) +static void emulated_exitfn(CCIDCardState *base) { EmulatedState *card = EMULATED_CCID_CARD(base); VEvent *vevent = vevent_new(VEVENT_LAST, NULL, NULL); @@ -564,7 +564,6 @@ static int emulated_exitfn(CCIDCardState *base) qemu_mutex_destroy(&card->handle_apdu_mutex); qemu_mutex_destroy(&card->vreader_mutex); qemu_mutex_destroy(&card->event_list_mutex); - return 0; } static Property emulated_card_properties[] = { diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 2eacea7..7209f73 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -364,11 +364,6 @@ static int passthru_initfn(CCIDCardState *base) return 0; } -static int passthru_exitfn(CCIDCardState *base) -{ - return 0; -} - static VMStateDescription passthru_vmstate = { .name = "ccid-card-passthru", .version_id = 1, @@ -395,7 +390,6 @@ static void passthru_class_initfn(ObjectClass *klass, void *data) CCIDCardClass *cc = CCID_CARD_CLASS(klass); cc->initfn = passthru_initfn; - cc->exitfn = passthru_exitfn; cc->get_atr = passthru_get_atr; cc->apdu_from_guest = passthru_apdu_from_guest; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h index 9334da8..1f07011 100644 --- a/hw/usb/ccid.h +++ b/hw/usb/ccid.h @@ -33,7 +33,7 @@ typedef struct CCIDCardClass { void (*apdu_from_guest)(CCIDCardState *card, const uint8_t *apdu, uint32_t len); - int (*exitfn)(CCIDCardState *card); + void (*exitfn)(CCIDCardState *card); int (*initfn)(CCIDCardState *card); } CCIDCardClass; diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index af4b851..e1940ad 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -508,14 +508,14 @@ static void ccid_card_apdu_from_guest(CCIDCardState *card, } } -static int ccid_card_exitfn(CCIDCardState *card) +static void ccid_card_exitfn(CCIDCardState *card) { CCIDCardClass *cc = CCID_CARD_GET_CLASS(card); if (cc->exitfn) { - return cc->exitfn(card); + cc->exitfn(card); } - return 0; + } static int ccid_card_initfn(CCIDCardState *card) @@ -1279,7 +1279,6 @@ void ccid_card_card_inserted(CCIDCardState *card) static int ccid_card_exit(DeviceState *qdev) { - int ret = 0; CCIDCardState *card = CCID_CARD(qdev); USBDevice *dev = USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s = USB_CCID_DEV(dev); @@ -1287,9 +1286,9 @@ static int ccid_card_exit(DeviceState *qdev) if (ccid_card_inserted(s)) { ccid_card_card_removed(card); } - ret = ccid_card_exitfn(card); + ccid_card_exitfn(card); s->card = NULL; - return ret; + return 0; } static int ccid_card_init(DeviceState *qdev)