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

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

Merge "usb: core: Remove helper APIs returning dcba dma address"

parents c7e4b578 e602dd17

drivers/usb/core/hcd.c

+0 −11
Original line number Diff line number Diff line
@@ -2268,17 +2268,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
@@ -715,16 +715,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)

{

include/linux/usb.h

+0 −1
Original line number Diff line number Diff line
@@ -753,7 +753,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 int 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 −1
Original line number Diff line number Diff line
@@ -452,7 +452,6 @@ extern int usb_hcd_sec_event_ring_cleanup(struct usb_device *udev, 
	unsigned int intr_num);

extern dma_addr_t usb_hcd_get_sec_event_ring_dma_addr(struct usb_device *udev,

		unsigned int 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);

extern int usb_hcd_get_controller_id(struct usb_device *udev);