From patchwork Thu Aug 11 07:03:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 109567 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4E6E8B6F88 for ; Thu, 11 Aug 2011 18:01:16 +1000 (EST) Received: from localhost ([::1]:56152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrQCW-0003MW-Dq for incoming@patchwork.ozlabs.org; Thu, 11 Aug 2011 04:01:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrQCN-0003MR-7O for qemu-devel@nongnu.org; Thu, 11 Aug 2011 04:01:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrQCI-0000tt-MD for qemu-devel@nongnu.org; Thu, 11 Aug 2011 04:01:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12801) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrQCI-0000tp-En for qemu-devel@nongnu.org; Thu, 11 Aug 2011 04:00:58 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7B80vNw002297 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 11 Aug 2011 04:00:57 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-16.ams2.redhat.com [10.36.116.16]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7B73oxw019870; Thu, 11 Aug 2011 03:03:50 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 7EADB41B26; Thu, 11 Aug 2011 09:03:46 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 11 Aug 2011 09:03:45 +0200 Message-Id: <1313046225-1064-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1313046225-1064-1-git-send-email-kraxel@redhat.com> References: <1313046225-1064-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 6/6] usb-hid: remove usb_hid_datain_cb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org No users left, all migrated over to hw/hid.[ch]. Yea! Zap it! Signed-off-by: Gerd Hoffmann --- hw/usb-hid.c | 14 -------------- hw/usb.h | 3 --- 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/hw/usb-hid.c b/hw/usb-hid.c index 6a75147..ba79466 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -45,8 +45,6 @@ typedef struct USBHIDState { USBDevice dev; HIDState hid; - void *datain_opaque; - void (*datain)(void *); } USBHIDState; enum { @@ -362,10 +360,6 @@ static void usb_hid_changed(HIDState *hs) { USBHIDState *us = container_of(hs, USBHIDState, hid); - if (us->datain) { - us->datain(us->datain_opaque); - } - usb_wakeup(&us->dev); } @@ -533,14 +527,6 @@ static int usb_keyboard_initfn(USBDevice *dev) return usb_hid_initfn(dev, HID_KEYBOARD); } -void usb_hid_datain_cb(USBDevice *dev, void *opaque, void (*datain)(void *)) -{ - USBHIDState *s = (USBHIDState *)dev; - - s->datain_opaque = opaque; - s->datain = datain; -} - static const VMStateDescription vmstate_usb_ptr = { .name = "usb-ptr", .version_id = 1, diff --git a/hw/usb.h b/hw/usb.h index 84d04df..d784448 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -316,9 +316,6 @@ USBDevice *usb_host_device_open(const char *devname); int usb_host_device_close(const char *devname); void usb_host_info(Monitor *mon); -/* usb-hid.c */ -void usb_hid_datain_cb(USBDevice *dev, void *opaque, void (*datain)(void *)); - /* usb-bt.c */ USBDevice *usb_bt_init(HCIInfo *hci);