From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJPJA-0005cp-L0 for qemu-devel@nongnu.org; Mon, 09 May 2011 08:11:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJPJ9-0007zV-OY for qemu-devel@nongnu.org; Mon, 09 May 2011 08:11:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57784) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJPJ9-0007zJ-Fu for qemu-devel@nongnu.org; Mon, 09 May 2011 08:11:27 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p49CBQFv031352 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 9 May 2011 08:11:26 -0400 From: Gerd Hoffmann Date: Mon, 9 May 2011 14:11:04 +0200 Message-Id: <1304943065-12023-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1304943065-12023-1-git-send-email-kraxel@redhat.com> References: <1304943065-12023-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] usb-musb: uninline functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Prototype without "inline" keyword breaks the build with some gcc versions. Noticed by Alexander Graf. Fix this by removing the inline keywork everywhere. Some functions can't be inlined anyway as the are referenced using function pointers. Beside that gcc does a pretty good job on auto-inlining these days. Signed-off-by: Gerd Hoffmann --- hw/usb-musb.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/usb-musb.c b/hw/usb-musb.c index b30caeb..38986d3 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -497,14 +497,14 @@ static void musb_detach(USBPort *port) musb_session_update(s, 1, s->session); } -static inline void musb_cb_tick0(void *opaque) +static void musb_cb_tick0(void *opaque) { MUSBEndPoint *ep = (MUSBEndPoint *) opaque; ep->delayed_cb[0](&ep->packey[0].p, opaque); } -static inline void musb_cb_tick1(void *opaque) +static void musb_cb_tick1(void *opaque) { MUSBEndPoint *ep = (MUSBEndPoint *) opaque; @@ -513,7 +513,7 @@ static inline void musb_cb_tick1(void *opaque) #define musb_cb_tick (dir ? musb_cb_tick1 : musb_cb_tick0) -static inline void musb_schedule_cb(USBDevice *dev, USBPacket *packey) +static void musb_schedule_cb(USBDevice *dev, USBPacket *packey) { MUSBPacket *p = container_of(packey, MUSBPacket, p); MUSBEndPoint *ep = p->ep; @@ -572,7 +572,7 @@ static int musb_timeout(int ttype, int speed, int val) hw_error("bad interval\n"); } -static inline void musb_packet(MUSBState *s, MUSBEndPoint *ep, +static void musb_packet(MUSBState *s, MUSBEndPoint *ep, int epnum, int pid, int len, USBCallback cb, int dir) { int ret; -- 1.7.1