Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "usb: host: xhci-plat: Create platform device for onboard hubs in probe()"

Browse Source 
This reverts commit c950686b38 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>
This commit is contained in:
Greg Kroah-Hartman 2021-06-18 08:37:19 +02:00
parent 8e4167f34a
commit 70b8edf9bb
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/host/Kconfig
View File

@ -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.

6
drivers/usb/host/xhci-plat.c
View File

@ -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);

2
drivers/usb/host/xhci.h
View File

@ -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));