From: Gonglei <arei.gonglei@huawei.com>
Date: Fri, 19 Sep 2014 06:48:41 +0000 (+0800)
Subject: usb-bus: remove "init" from USBDeviceClass struct
X-Git-Tag: v2.2.0-rc0~100^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd2ba2752d860d5a0b4f328332c3e0b79d275de8;p=thirdparty%2Fqemu.git

usb-bus: remove "init" from USBDeviceClass struct

All usb-bus devices are realized by realize(),
remove init callback function from USBDeviceClass struct.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 12881cbdd1b..b375293529c 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -113,8 +113,6 @@ static void usb_device_realize(USBDevice *dev, Error **errp)
 
     if (klass->realize) {
         klass->realize(dev, errp);
-    } else if (klass->init) {
-        klass->init(dev);
     }
 }
 
diff --git a/include/hw/usb.h b/include/hw/usb.h
index 612f09f8c15..8ffbba21741 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -273,8 +273,6 @@ typedef void (*USBDeviceUnrealize)(USBDevice *dev, Error **errp);
 typedef struct USBDeviceClass {
     DeviceClass parent_class;
 
-    int (*init)(USBDevice *dev);
-
     USBDeviceRealize realize;
     USBDeviceUnrealize unrealize;