Revert "usb: core: hcd: Create platform devices for onboard hubs in probe()"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 May 2022 14:44:02 +0000 (16:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 3 May 2022 14:48:09 +0000 (16:48 +0200)
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>
drivers/usb/core/hcd.c
include/linux/usb/hcd.h

index 8178507..d9712c2 100644 (file)
@@ -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);
index 4ebc91c..548a028 100644 (file)
@@ -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];