[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] usb-ccid: inline ccid_card_initfn() in ccid_card
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/5] usb-ccid: inline ccid_card_initfn() in ccid_card_realize() |
Date: |
Fri, 26 Jan 2018 09:05:14 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-smartcard-reader.c | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 0092493f4e..85f5f2247b 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -510,20 +510,6 @@ static void ccid_card_exitfn(CCIDCardState *card)
}
-static void ccid_card_initfn(CCIDCardState *card, Error **errp)
-{
- CCIDCardClass *cc = CCID_CARD_GET_CLASS(card);
- Error *local_err = NULL;
-
- if (cc->realize) {
- cc->realize(card, &local_err);
- if (local_err != NULL) {
- error_propagate(errp, local_err);
- return;
- }
- }
-}
-
static bool ccid_has_pending_answers(USBCCIDState *s)
{
return s->pending_answers_num > 0;
@@ -1302,6 +1288,7 @@ static int ccid_card_exit(DeviceState *qdev)
static void ccid_card_realize(DeviceState *qdev, Error **errp)
{
CCIDCardState *card = CCID_CARD(qdev);
+ CCIDCardClass *cc = CCID_CARD_GET_CLASS(card);
USBDevice *dev = USB_DEVICE(qdev->parent_bus->parent);
USBCCIDState *s = USB_CCID_DEV(dev);
Error *local_err = NULL;
@@ -1315,10 +1302,12 @@ static void ccid_card_realize(DeviceState *qdev, Error
**errp)
error_setg(errp, "usb-ccid card already full, not adding");
return;
}
- ccid_card_initfn(card, &local_err);
- if (local_err != NULL) {
- error_propagate(errp, local_err);
- return;
+ if (cc->realize) {
+ cc->realize(card, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
}
s->card = card;
}
--
2.9.3
- [Qemu-devel] [PULL 0/5] Usb 20180126 v3 patches, Gerd Hoffmann, 2018/01/26
- [Qemu-devel] [PULL 5/5] usb-ccid: convert CCIDCardClass::exitfn() -> unrealize(), Gerd Hoffmann, 2018/01/26
- [Qemu-devel] [PULL 1/5] usb: Remove legacy -usbdevice options (host, serial, disk and net), Gerd Hoffmann, 2018/01/26
- [Qemu-devel] [PULL 4/5] usb-ccid: inline ccid_card_initfn() in ccid_card_realize(),
Gerd Hoffmann <=
- [Qemu-devel] [PULL 2/5] usb-storage: Fix share-rw option parsing, Gerd Hoffmann, 2018/01/26
- [Qemu-devel] [PULL 3/5] hw/usb/ccid: Make ccid_card_init() take an error parameter, Gerd Hoffmann, 2018/01/26
- Re: [Qemu-devel] [PULL 0/5] Usb 20180126 v3 patches, Peter Maydell, 2018/01/26