History

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.

Greg Kroah-Hartman committed 4 years ago

Commit f2b6e791 parent b9c92fb2 files · +0 −7Browse files

Unified · Split

2 files
  1. drivers/usb/core/hcd.c +0 −6
  2. include/linux/usb/hcd.h +0 −1
drivers/usb/core/hcd.c+0−6
@@ -36,7 +36,6 @@ · 35 unmodified lines
36#include <linux/phy/phy.h>36#include <linux/phy/phy.h>
37#include <linux/usb.h>37#include <linux/usb.h>
38#include <linux/usb/hcd.h>38#include <linux/usb/hcd.h>
39#include <linux/usb/onboard_hub.h>
40#include <linux/usb/otg.h>39#include <linux/usb/otg.h>
41 40
42#include "usb.h"41#include "usb.h"
@@ -2985,9 +2984,6 @@ int usb_add_hcd(struct usb_hcd *hcd, · 2942 unmodified lines
2985 if (hcd->uses_new_polling && HCD_POLL_RH(hcd))2984 if (hcd->uses_new_polling && HCD_POLL_RH(hcd))
2986 usb_hcd_poll_rh_status(hcd);2985 usb_hcd_poll_rh_status(hcd);
2987 2986
2988 if (usb_hcd_is_primary_hcd(hcd))
2989 onboard_hub_create_pdevs(hcd->self.root_hub, &hcd->onboard_hub_devs);
2990
2991 return retval;2987 return retval;
2992 2988
2993err_register_root_hub:2989err_register_root_hub:
@@ -3066,8 +3062,6 @@ void usb_remove_hcd(struct usb_hcd *hcd) · 72 unmodified lines
3066 if (usb_hcd_is_primary_hcd(hcd)) {3062 if (usb_hcd_is_primary_hcd(hcd)) {
3067 if (hcd->irq > 0)3063 if (hcd->irq > 0)
3068 free_irq(hcd->irq, hcd);3064 free_irq(hcd->irq, hcd);
3069
3070 onboard_hub_destroy_pdevs(&hcd->onboard_hub_devs);
3071 }3065 }
3072 3066
3073 usb_deregister_bus(&hcd->self);3067 usb_deregister_bus(&hcd->self);
include/linux/usb/hcd.h+0−1
@@ -198,7 +198,6 @@ struct usb_hcd { · 197 unmodified lines
198 struct usb_hcd *shared_hcd;198 struct usb_hcd *shared_hcd;
199 struct usb_hcd *primary_hcd;199 struct usb_hcd *primary_hcd;
200 200
201 struct list_head onboard_hub_devs;
202 201
203#define HCD_BUFFER_POOLS 4202#define HCD_BUFFER_POOLS 4
204 struct dma_pool *pool[HCD_BUFFER_POOLS];203 struct dma_pool *pool[HCD_BUFFER_POOLS];