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

Commit b7258a4a authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Greg Kroah-Hartman
Browse files

USB: xhci: use xhci_handle_event instead of handle_event 



The former is way to generic for a global symbol.

Fixes this build error:

drivers/usb/built-in.o: In function `.handle_event': (.text+0x67dd0): multiple definition of `.handle_event'
drivers/pcmcia/built-in.o:(.text+0xcfcc): first defined here
drivers/usb/built-in.o: In function `handle_event': (.opd+0x5bc8): multiple definition of `handle_event'
drivers/pcmcia/built-in.o:(.opd+0xed0): first defined here

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ae636747

drivers/usb/host/xhci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void xhci_work(struct xhci_hcd *xhci) 
	xhci_readl(xhci, &xhci->ir_set->irq_pending);



	/* FIXME this should be a delayed service routine that clears the EHB */

	handle_event(xhci);

	xhci_handle_event(xhci);



	/* Clear the event handler busy flag; the event ring should be empty. */

	temp = xhci_readl(xhci, &xhci->ir_set->erst_dequeue[0]);

drivers/usb/host/xhci-ring.c

+2 −2
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ static int handle_tx_event(struct xhci_hcd *xhci, 
 * This function handles all OS-owned events on the event ring.  It may drop

 * xhci->lock between event processing (e.g. to pass up port status changes).

 */

void handle_event(struct xhci_hcd *xhci)

void xhci_handle_event(struct xhci_hcd *xhci)

{

	union xhci_trb *event;

	int update_ptrs = 1;
@@ -1054,7 +1054,7 @@ void handle_event(struct xhci_hcd *xhci) 
		set_hc_event_deq(xhci);

	}

	/* Are there more items on the event ring? */

	handle_event(xhci);

	xhci_handle_event(xhci);

}



/****		Endpoint Ring Operations	****/

drivers/usb/host/xhci.h

+1 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev); 
dma_addr_t trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb);

void ring_cmd_db(struct xhci_hcd *xhci);

void *setup_one_noop(struct xhci_hcd *xhci);

void handle_event(struct xhci_hcd *xhci);

void xhci_handle_event(struct xhci_hcd *xhci);

void set_hc_event_deq(struct xhci_hcd *xhci);

int queue_slot_control(struct xhci_hcd *xhci, u32 trb_type, u32 slot_id);

int queue_address_device(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, u32 slot_id);