mirror of https://github.com/xemu-project/xemu.git
usb-ccid: inline ccid_card_initfn() in ccid_card_realize()
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20180125171432.13554-3-f4bug@amsat.org Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
cc847bfd16
commit
c7516699fc
|
@ -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)
|
static bool ccid_has_pending_answers(USBCCIDState *s)
|
||||||
{
|
{
|
||||||
return s->pending_answers_num > 0;
|
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)
|
static void ccid_card_realize(DeviceState *qdev, Error **errp)
|
||||||
{
|
{
|
||||||
CCIDCardState *card = CCID_CARD(qdev);
|
CCIDCardState *card = CCID_CARD(qdev);
|
||||||
|
CCIDCardClass *cc = CCID_CARD_GET_CLASS(card);
|
||||||
USBDevice *dev = USB_DEVICE(qdev->parent_bus->parent);
|
USBDevice *dev = USB_DEVICE(qdev->parent_bus->parent);
|
||||||
USBCCIDState *s = USB_CCID_DEV(dev);
|
USBCCIDState *s = USB_CCID_DEV(dev);
|
||||||
Error *local_err = NULL;
|
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");
|
error_setg(errp, "usb-ccid card already full, not adding");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ccid_card_initfn(card, &local_err);
|
if (cc->realize) {
|
||||||
if (local_err != NULL) {
|
cc->realize(card, &local_err);
|
||||||
error_propagate(errp, local_err);
|
if (local_err != NULL) {
|
||||||
return;
|
error_propagate(errp, local_err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
s->card = card;
|
s->card = card;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue