Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c9a7dbf authored by Sarah Sharp's avatar Sarah Sharp Committed by Greg Kroah-Hartman
Browse files

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c38b9401

drivers/usb/host/xhci-dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/usb/host/xhci.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */