diff options
| author | Greg Kroah-Hartman | 2021-06-18 08:37:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2021-06-18 08:37:19 +0200 |
| commit | 70b8edf9bb6be97e46374c601c687b4f4b0716e1 (patch) | |
| tree | 940dd5ba7a5403db02fd6c76e272adf907636286 /drivers/usb/host | |
| parent | 8e4167f34a3be35af3708ea2f0e5bb3fc71eab75 (diff) | |
Revert "usb: host: xhci-plat: Create platform device for onboard hubs in probe()"
This reverts commit c950686b382d0ea5234545fcce252c9e63d7b7a9 as the
patch series is causing build issues in linux-next at the moment.
Cc: Matthias Kaehlcke <mka@chromium.org>
Link: https://lore.kernel.org/r/YMuRcrE8xlWnFSWW@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/usb/host/xhci-plat.c | 6 | ||||
| -rw-r--r-- | drivers/usb/host/xhci.h | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 46818b232204..df9428f1dc5e 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -54,7 +54,6 @@ config USB_XHCI_PCI_RENESAS config USB_XHCI_PLATFORM tristate "Generic xHCI driver for a platform device" select USB_XHCI_RCAR if ARCH_RENESAS - depends on USB_ONBOARD_HUB || !USB_ONBOARD_HUB help Adds an xHCI host driver for a generic platform device, which provides a memory space and an irq. diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index ee98a3671619..c1edcc9b13ce 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -15,7 +15,6 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/platform_device.h> -#include <linux/usb/onboard_hub.h> #include <linux/usb/phy.h> #include <linux/slab.h> #include <linux/acpi.h> @@ -375,9 +374,6 @@ static int xhci_plat_probe(struct platform_device *pdev) */ pm_runtime_forbid(&pdev->dev); - INIT_LIST_HEAD(&xhci->onboard_hub_devs); - onboard_hub_create_pdevs(hcd->self.root_hub, &xhci->onboard_hub_devs); - return 0; @@ -424,8 +420,6 @@ static int xhci_plat_remove(struct platform_device *dev) usb_remove_hcd(hcd); usb_put_hcd(shared_hcd); - onboard_hub_destroy_pdevs(&xhci->onboard_hub_devs); - clk_disable_unprepare(clk); clk_disable_unprepare(reg_clk); usb_put_hcd(hcd); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 5ba01d5ccab8..3c7d281672ae 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1923,8 +1923,6 @@ struct xhci_hcd { struct dentry *debugfs_slots; struct list_head regset_list; - struct list_head onboard_hub_devs; - void *dbc; /* platform-specific data -- must come last */ unsigned long priv[] __aligned(sizeof(s64)); |