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

Commit 006a8472 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: host: xhci: Remove helper API retuning dcba dma address"

parents 975d2dff 4d43bee6

drivers/usb/host/xhci.c

+0 −12
Original line number Diff line number Diff line
@@ -4983,17 +4983,6 @@ dma_addr_t xhci_get_sec_event_ring_dma_addr(struct usb_hcd *hcd, 
	return 0;

}



dma_addr_t xhci_get_dcba_dma_addr(struct usb_hcd *hcd,

	struct usb_device *udev)

{

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);



	if (!(xhci->xhc_state & XHCI_STATE_HALTED) && xhci->dcbaa)

		return xhci->dcbaa->dev_context_ptrs[udev->slot_id];



	return 0;

}



dma_addr_t xhci_get_xfer_ring_dma_addr(struct usb_hcd *hcd,

	struct usb_device *udev, struct usb_host_endpoint *ep)

{
@@ -5089,7 +5078,6 @@ static const struct hc_driver xhci_hc_driver = { 
	.sec_event_ring_cleanup =	xhci_sec_event_ring_cleanup,

	.get_sec_event_ring_dma_addr =	xhci_get_sec_event_ring_dma_addr,

	.get_xfer_ring_dma_addr =	xhci_get_xfer_ring_dma_addr,

	.get_dcba_dma_addr =		xhci_get_dcba_dma_addr,

	.get_core_id =			xhci_get_core_id,

};

include/linux/usb/hcd.h

+0 −2
Original line number Diff line number Diff line
@@ -405,8 +405,6 @@ struct hc_driver { 
			unsigned int intr_num);

	dma_addr_t (*get_xfer_ring_dma_addr)(struct usb_hcd *hcd,

			struct usb_device *udev, struct usb_host_endpoint *ep);

	dma_addr_t (*get_dcba_dma_addr)(struct usb_hcd *hcd,

			struct usb_device *udev);

	int (*get_core_id)(struct usb_hcd *hcd);

};