diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-03 16:44:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-03 16:48:09 +0200 |
| commit | f2b6e79c7378542e03e42fd47c0c8bf00a2fcf6b (patch) | |
| tree | f8a721b3cbce21c8e403c0ddedd5aa8c2c9ec6c1 | |
| parent | Merge 5.18-rc5 into usb-next (diff) | |
| download | linux-dev-f2b6e79c7378542e03e42fd47c0c8bf00a2fcf6b.tar.xz linux-dev-f2b6e79c7378542e03e42fd47c0c8bf00a2fcf6b.zip | |
Revert "usb: core: hcd: Create platform devices for onboard hubs in probe()"
This reverts commit c40b62216c1aecc0dc00faf33d71bd71cb440337.
The series still has built errors as reported in linux-next, so revert
it for now.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20220502210728.0b36f3cd@canb.auug.org.au
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/hcd.c | 6 | ||||
| -rw-r--r-- | include/linux/usb/hcd.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 81785072fafb..d9712c2602af 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -36,7 +36,6 @@ #include <linux/phy/phy.h> #include <linux/usb.h> #include <linux/usb/hcd.h> -#include <linux/usb/onboard_hub.h> #include <linux/usb/otg.h> #include "usb.h" @@ -2985,9 +2984,6 @@ int usb_add_hcd(struct usb_hcd *hcd, if (hcd->uses_new_polling && HCD_POLL_RH(hcd)) usb_hcd_poll_rh_status(hcd); - if (usb_hcd_is_primary_hcd(hcd)) - onboard_hub_create_pdevs(hcd->self.root_hub, &hcd->onboard_hub_devs); - return retval; err_register_root_hub: @@ -3066,8 +3062,6 @@ void usb_remove_hcd(struct usb_hcd *hcd) if (usb_hcd_is_primary_hcd(hcd)) { if (hcd->irq > 0) free_irq(hcd->irq, hcd); - - onboard_hub_destroy_pdevs(&hcd->onboard_hub_devs); } usb_deregister_bus(&hcd->self); diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index 4ebc91c09182..548a028f2dab 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -198,7 +198,6 @@ struct usb_hcd { struct usb_hcd *shared_hcd; struct usb_hcd *primary_hcd; - struct list_head onboard_hub_devs; #define HCD_BUFFER_POOLS 4 struct dma_pool *pool[HCD_BUFFER_POOLS]; |