diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-17 03:38:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-17 03:38:30 -0700 |
| commit | 67455180f375689b0d451c3db180873e7165812f (patch) | |
| tree | 4548bf4c84237a76b5642c4b007d24d152bc7a58 /include | |
| parent | 125f0beedcf6f079fc0b8c4f2d9307e9d8f479b1 (diff) | |
| parent | fb863387e653c855286148e8ee4d742e83f6f2c4 (diff) | |
Merge "Revert "usb: core: Add helper function to return controller id""
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb.h | 1 | ||||
| -rw-r--r-- | include/linux/usb/hcd.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 2189e292d50c..d88c31c8e6a4 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -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, diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index f603b46ff48a..dff7adbc60bb 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -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); |