mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb-musb: uninline functions

Browse Source 
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 <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2011-05-09 09:44:03 +02:00
parent 85097db695
commit b3e5759e09
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/usb-musb.c
View File

@ -497,14 +497,14 @@ static void musb_detach(USBPort *port)
musb_session_update(s, 1, s->session); 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; MUSBEndPoint *ep = (MUSBEndPoint *) opaque;
ep->delayed_cb[0](&ep->packey[0].p, 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; 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) #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); MUSBPacket *p = container_of(packey, MUSBPacket, p);
MUSBEndPoint *ep = p->ep; MUSBEndPoint *ep = p->ep;
@ -572,7 +572,7 @@ static int musb_timeout(int ttype, int speed, int val)
hw_error("bad interval\n"); 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 epnum, int pid, int len, USBCallback cb, int dir)
{ {
int ret; int ret;