evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "usb: core: Add helper function to return controller id""

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-17 03:38:31 -07:00 • committed by Gerrit - the friendly Code Review server
commit 67455180f3
4 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/usb/core/hcd.c
View file

@ -2264,16 +2264,6 @@ usb_hcd_get_xfer_ring_dma_addr(struct usb_device *udev,
return hcd->driver->get_xfer_ring_dma_addr(hcd, udev, ep);
}
int usb_hcd_get_controller_id(struct usb_device *udev)
{
struct usb_hcd *hcd = bus_to_hcd(udev->bus);
if (!HCD_RH_RUNNING(hcd))
return -EINVAL;
return hcd->driver->get_core_id(hcd);
}
#ifdef CONFIG_PM
int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg)

9
drivers/usb/core/usb.c
View file

@ -717,15 +717,6 @@ dma_addr_t usb_get_xfer_ring_dma_addr(struct usb_device *dev,
}
EXPORT_SYMBOL(usb_get_xfer_ring_dma_addr);
int usb_get_controller_id(struct usb_device *dev)
{
if (dev->state == USB_STATE_NOTATTACHED)
return -EINVAL;
return usb_hcd_get_controller_id(dev);
}
EXPORT_SYMBOL(usb_get_controller_id);
/*-------------------------------------------------------------------*/
/*
* __usb_get_extra_descriptor() finds a descriptor of specific type in the

1
include/linux/usb.h
View file

@ -756,7 +756,6 @@ usb_get_sec_event_ring_dma_addr(struct usb_device *dev,
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);
/* Sets up a group of bulk endpoints to support multiple stream IDs. */
extern int usb_alloc_streams(struct usb_interface *interface,

2
include/linux/usb/hcd.h
View file

@ -405,7 +405,6 @@ struct hc_driver {
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);
};
static inline int hcd_giveback_urb_in_bh(struct usb_hcd *hcd)
@ -455,7 +454,6 @@ 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);
extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver,
struct device *dev, const char *bus_name);