diff options
| author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2010-01-04 21:20:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 23:54:01 +0100 |
| commit | 9c9a7dbf9a73191a24a13b9a0412355254a122c7 (patch) | |
| tree | 2e0a8a758e175b63505e5bf7803fff100e3ca63f | |
| parent | USB: c67x00: use resource_size(). (diff) | |
| download | linux-9c9a7dbf9a73191a24a13b9a0412355254a122c7.tar.xz linux-9c9a7dbf9a73191a24a13b9a0412355254a122c7.zip | |
USB: xhci: Fix compile issues with xhci_get_slot_state()
Randy Dunlap reported this error when compiling the xHCI driver:
linux-next-20100104/drivers/usb/host/xhci.h:1214:
sorry, unimplemented: inlining failed in call to 'xhci_get_slot_state': function body not available
The xhci_get_slot_state() function belongs in xhci-dbg.c, since it
involves debugging internal xHCI structures. However, it is only used in
xhci-hcd.c. Some toolchains may have issues since the inlined function
body is not in the xhci.h header file. Remove the inline keyword to avoid
this.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/host/xhci-dbg.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/xhci.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c index b2915aea47ee..105fa8b025bb 100644 --- a/drivers/usb/host/xhci-dbg.c +++ b/drivers/usb/host/xhci-dbg.c @@ -406,7 +406,7 @@ static void dbg_rsvd64(struct xhci_hcd *xhci, u64 *ctx, dma_addr_t dma) } } -inline char *xhci_get_slot_state(struct xhci_hcd *xhci, +char *xhci_get_slot_state(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx) { struct xhci_slot_ctx *slot_ctx = xhci_get_slot_ctx(xhci, ctx); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 741ece482e31..e5eb09b2f38e 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1210,7 +1210,7 @@ void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst); void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci); void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring); void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep); -inline char *xhci_get_slot_state(struct xhci_hcd *xhci, +char *xhci_get_slot_state(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx); /* xHCI memory management */ |