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

Commit 257d585a authored by Sarah Sharp's avatar Sarah Sharp Committed by Greg Kroah-Hartman
Browse files

USB: xhci: Make xhci_set_hc_event_deq() static. 



Now that the event handler functions no longer use xhci_set_hc_event_deq()
to update the event ring dequeue pointer, that function is not used by
anything in xhci-ring.c.  Move that function into xhci-mem.c and make it
static.

Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c06d68b8

drivers/usb/host/xhci-mem.c

+23 −0
Original line number Diff line number Diff line
@@ -1601,6 +1601,29 @@ static int xhci_check_trb_in_td_math(struct xhci_hcd *xhci, gfp_t mem_flags) 
	return 0;

}



static void xhci_set_hc_event_deq(struct xhci_hcd *xhci)

{

	u64 temp;

	dma_addr_t deq;



	deq = xhci_trb_virt_to_dma(xhci->event_ring->deq_seg,

			xhci->event_ring->dequeue);

	if (deq == 0 && !in_interrupt())

		xhci_warn(xhci, "WARN something wrong with SW event ring "

				"dequeue ptr.\n");

	/* Update HC event ring dequeue pointer */

	temp = xhci_read_64(xhci, &xhci->ir_set->erst_dequeue);

	temp &= ERST_PTR_MASK;

	/* Don't clear the EHB bit (which is RW1C) because

	 * there might be more events to service.

	 */

	temp &= ~ERST_EHB;

	xhci_dbg(xhci, "// Write event ring dequeue pointer, "

			"preserving EHB bit\n");

	xhci_write_64(xhci, ((u64) deq & (u64) ~ERST_PTR_MASK) | temp,

			&xhci->ir_set->erst_dequeue);

}





int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)

{

drivers/usb/host/xhci-ring.c

+0 −22
Original line number Diff line number Diff line
@@ -301,28 +301,6 @@ static int room_on_ring(struct xhci_hcd *xhci, struct xhci_ring *ring, 
	return 1;

}



void xhci_set_hc_event_deq(struct xhci_hcd *xhci)

{

	u64 temp;

	dma_addr_t deq;



	deq = xhci_trb_virt_to_dma(xhci->event_ring->deq_seg,

			xhci->event_ring->dequeue);

	if (deq == 0 && !in_interrupt())

		xhci_warn(xhci, "WARN something wrong with SW event ring "

				"dequeue ptr.\n");

	/* Update HC event ring dequeue pointer */

	temp = xhci_read_64(xhci, &xhci->ir_set->erst_dequeue);

	temp &= ERST_PTR_MASK;

	/* Don't clear the EHB bit (which is RW1C) because

	 * there might be more events to service.

	 */

	temp &= ~ERST_EHB;

	xhci_dbg(xhci, "// Write event ring dequeue pointer, preserving EHB bit\n");

	xhci_write_64(xhci, ((u64) deq & (u64) ~ERST_PTR_MASK) | temp,

			&xhci->ir_set->erst_dequeue);

}



/* Ring the host controller doorbell after placing a command on the ring */

void xhci_ring_cmd_db(struct xhci_hcd *xhci)

{

drivers/usb/host/xhci.h

+0 −1
Original line number Diff line number Diff line
@@ -1400,7 +1400,6 @@ struct xhci_segment *trb_in_td(struct xhci_segment *start_seg, 
int xhci_is_vendor_info_code(struct xhci_hcd *xhci, unsigned int trb_comp_code);

void xhci_ring_cmd_db(struct xhci_hcd *xhci);

void *xhci_setup_one_noop(struct xhci_hcd *xhci);

void xhci_set_hc_event_deq(struct xhci_hcd *xhci);

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

int xhci_queue_address_device(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr,

		u32 slot_id);