On Thu, May 19, 2011 at 01:37:14PM +0200, Markus Armbruster wrote:
>
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
ACK.
> ---
> hw/ccid.h | 1 -
> hw/usb-ccid.c | 11 -----------
> 2 files changed, 0 insertions(+), 12 deletions(-)
>
> diff --git a/hw/ccid.h b/hw/ccid.h
> index dbfc13c..d3e0371 100644
> --- a/hw/ccid.h
> +++ b/hw/ccid.h
> @@ -29,7 +29,6 @@ struct CCIDCardState {
> */
> struct CCIDCardInfo {
> DeviceInfo qdev;
> - void (*print)(Monitor *mon, CCIDCardState *card, int indent);
> const uint8_t *(*get_atr)(CCIDCardState *card, uint32_t *len);
> void (*apdu_from_guest)(CCIDCardState *card,
> const uint8_t *apdu,
> diff --git a/hw/usb-ccid.c b/hw/usb-ccid.c
> index 079b4a2..7772fe7 100644
> --- a/hw/usb-ccid.c
> +++ b/hw/usb-ccid.c
> @@ -1103,16 +1103,6 @@ static Answer *ccid_peek_next_answer(USBCCIDState *s)
> : &s->pending_answers[s->pending_answers_start %
> PENDING_ANSWERS_NUM];
> }
>
> -static void ccid_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent)
> -{
> - CCIDCardState *card = DO_UPCAST(CCIDCardState, qdev, qdev);
> - CCIDCardInfo *info = DO_UPCAST(CCIDCardInfo, qdev, qdev->info);
> -
> - if (info->print) {
> - info->print(mon, card, indent);
> - }
> -}
> -
> struct CCIDBus {
> BusState qbus;
> };
> @@ -1120,7 +1110,6 @@ struct CCIDBus {
> static struct BusInfo ccid_bus_info = {
> .name = "ccid-bus",
> .size = sizeof(CCIDBus),
> - .print_dev = ccid_bus_dev_print,
> .props = (Property[]) {
> DEFINE_PROP_UINT32("slot", struct CCIDCardState, slot, 0),
> DEFINE_PROP_END_OF_LIST(),
> --
> 1.7.2.3
>
