Commit c7516699 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Gerd Hoffmann
Browse files

usb-ccid: inline ccid_card_initfn() in ccid_card_realize() 



Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180125171432.13554-3-f4bug@amsat.org
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent cc847bfd

hw/usb/dev-smartcard-reader.c

+7 −18
Original line number Diff line number Diff line
@@ -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,11 +1302,13 @@ 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 (cc->realize) {

        cc->realize(card, &local_err);

        if (local_err != NULL) {

            error_propagate(errp, local_err);

            return;

        }

    }

    s->card = card;

}