From fb863387e653c855286148e8ee4d742e83f6f2c4 Mon Sep 17 00:00:00 2001
From: Ajay Agarwal <ajaya@codeaurora.org>
Date: Fri, 4 May 2018 10:21:26 +0530
Subject: [PATCH] Revert "usb: core: Add helper function to return controller
 id"

This reverts commit c611d78437adeb9299d8be3f7be78b9c153152e5.

Remove helper function to return controller id.

Change-Id: Iadc085bf1dd9553c0805511f3cbafabdec8744f5
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>
---
 drivers/usb/core/hcd.c  | 10 ----------
 drivers/usb/core/usb.c  |  9 ---------
 include/linux/usb.h     |  1 -
 include/linux/usb/hcd.h |  2 --
 4 files changed, 22 deletions(-)

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index d7b580cf7f57..47eda4b3aea5 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -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)
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index e64fd6570a23..062677f8e91d 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -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
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);