From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWOyu-0005sR-JS for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWOyl-0002AG-OK for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWOyl-00029K-Gx for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:13:59 -0400 From: Gerd Hoffmann Date: Tue, 23 Sep 2014 14:13:32 +0200 Message-Id: <1411474417-9704-22-git-send-email-kraxel@redhat.com> In-Reply-To: <1411474417-9704-1-git-send-email-kraxel@redhat.com> References: <1411474417-9704-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 21/26] usb-bus: remove "init" from USBDeviceClass struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Gerd Hoffmann From: Gonglei All usb-bus devices are realized by realize(), remove init callback function from USBDeviceClass struct. Signed-off-by: Gonglei Reviewed-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann --- hw/usb/bus.c | 2 -- include/hw/usb.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 12881cb..b375293 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 612f09f..8ffbba2 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; -- 1.8.3.1