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

Commit 63dbbf58 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 b3b6467d 9c1d8839

drivers/usb/core/hcd.c

+0 −11
Original line number Diff line number Diff line
@@ -2241,17 +2241,6 @@ usb_hcd_get_sec_event_ring_dma_addr(struct usb_device *udev, 
	return hcd->driver->get_sec_event_ring_dma_addr(hcd, intr_num);

}



dma_addr_t

usb_hcd_get_dcba_dma_addr(struct usb_device *udev)

{

	struct usb_hcd	*hcd = bus_to_hcd(udev->bus);



	if (!HCD_RH_RUNNING(hcd))

		return 0;



	return hcd->driver->get_dcba_dma_addr(hcd, udev);

}



dma_addr_t

usb_hcd_get_xfer_ring_dma_addr(struct usb_device *udev,

		struct usb_host_endpoint *ep)

drivers/usb/core/usb.c

+0 −10
Original line number Diff line number Diff line
@@ -697,16 +697,6 @@ usb_get_sec_event_ring_dma_addr(struct usb_device *dev, 
}

EXPORT_SYMBOL(usb_get_sec_event_ring_dma_addr);



dma_addr_t

usb_get_dcba_dma_addr(struct usb_device *dev)

{

	if (dev->state == USB_STATE_NOTATTACHED)

		return 0;



	return usb_hcd_get_dcba_dma_addr(dev);

}

EXPORT_SYMBOL(usb_get_dcba_dma_addr);



dma_addr_t usb_get_xfer_ring_dma_addr(struct usb_device *dev,

	struct usb_host_endpoint *ep)

{

drivers/usb/host/xhci.c

+0 −12
Original line number Diff line number Diff line
@@ -4995,17 +4995,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)

{
@@ -5101,7 +5090,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.h

+0 −1
Original line number Diff line number Diff line
@@ -752,7 +752,6 @@ extern int usb_sec_event_ring_cleanup(struct usb_device *dev, 
extern dma_addr_t

usb_get_sec_event_ring_dma_addr(struct usb_device *dev,

		unsigned intr_num);

extern dma_addr_t usb_get_dcba_dma_addr(struct usb_device *dev);

extern dma_addr_t usb_get_xfer_ring_dma_addr(struct usb_device *dev,

	struct usb_host_endpoint *ep);

extern int usb_get_controller_id(struct usb_device *dev);

include/linux/usb/hcd.h

+0 −3
Original line number Diff line number Diff line
@@ -403,8 +403,6 @@ struct hc_driver { 
			unsigned 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);

};
@@ -451,7 +449,6 @@ extern int usb_hcd_sec_event_ring_cleanup(struct usb_device *udev, 
extern dma_addr_t

usb_hcd_get_sec_event_ring_dma_addr(struct usb_device *udev,

		unsigned intr_num);

extern dma_addr_t usb_hcd_get_dcba_dma_addr(struct usb_device *udev);

extern dma_addr_t

usb_hcd_get_xfer_ring_dma_addr(struct usb_device *udev,

	struct usb_host_endpoint *ep);