[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 13/23] usb: Change *_exitfn return type from int to
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 13/23] usb: Change *_exitfn return type from int to void |
Date: |
Fri, 28 Oct 2016 18:18:44 +0300 |
From: Akanksha Srivastava <address@hidden>
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 <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
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(-)
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 325129a..88cb6d8 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -365,11 +365,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,
@@ -396,7 +391,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..89e11b6 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)
--
2.1.4
- [Qemu-trivial] [PULL 00/23] Trivial patches for 2016-10-28, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 07/23] lm32: milkymist-tmu2: fix integer overflow, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 01/23] filter-dump: add missing "[", Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 08/23] target-lm32: rewrite gen_compare(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 02/23] hw/tpm/tpm_passthrough: Simplify if-statements a little bit, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 05/23] target-lm32: swap operand of wcsr in LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 19/23] qemu-ga: Remove stray 'q' in documentation, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 11/23] colo-compare: remove unused struct CompareChardevProps and 'props' variable, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 13/23] usb: Change *_exitfn return type from int to void,
Michael Tokarev <=
- [Qemu-trivial] [PULL 06/23] target-lm32: disable asm logging via LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 17/23] s390: avoid always-true comparison in s390_pci_generate_fid(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 04/23] target-lm32: fix LOG_DIS operand order, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 23/23] Fix build for less common build directories names, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 20/23] monitor: deprecate 'default' option, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 03/23] target-lm32: fix style issue, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 15/23] scripts/hxtool: fix undefined behavour of echo, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 18/23] Makefile: Fix help text for target 'installer', Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 14/23] qemu-options.hx: set: fix copy-paste error, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 16/23] migration: Remove unneeded NULL check from migrate_fd_error(), Michael Tokarev, 2016/10/28