This reverts commit c40b62216c1aecc0dc00faf33d71bd71cb440337. The series still has built errors as reported in linux-next, so revert it for now.
Unified · Split
| @@ -36,7 +36,6 @@ · 35 unmodified lines | ||
| 36 | 36 | #include <linux/phy/phy.h> |
| 37 | 37 | #include <linux/usb.h> |
| 38 | 38 | #include <linux/usb/hcd.h> |
| 39 | −#include <linux/usb/onboard_hub.h> | |
| 40 | 39 | #include <linux/usb/otg.h> |
| 41 | 40 | |
| 42 | 41 | #include "usb.h" |
| @@ -2985,9 +2984,6 @@ int usb_add_hcd(struct usb_hcd *hcd, · 2942 unmodified lines | ||
| 2985 | 2984 | if (hcd->uses_new_polling && HCD_POLL_RH(hcd)) |
| 2986 | 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 | 2987 | return retval; |
| 2992 | 2988 | |
| 2993 | 2989 | err_register_root_hub: |
| @@ -3066,8 +3062,6 @@ void usb_remove_hcd(struct usb_hcd *hcd) · 72 unmodified lines | ||
| 3066 | 3062 | if (usb_hcd_is_primary_hcd(hcd)) { |
| 3067 | 3063 | if (hcd->irq > 0) |
| 3068 | 3064 | free_irq(hcd->irq, hcd); |
| 3069 | − | |
| 3070 | − onboard_hub_destroy_pdevs(&hcd->onboard_hub_devs); | |
| 3071 | 3065 | } |
| 3072 | 3066 | |
| 3073 | 3067 | usb_deregister_bus(&hcd->self); |
| @@ -198,7 +198,6 @@ struct usb_hcd { · 197 unmodified lines | ||
| 198 | 198 | struct usb_hcd *shared_hcd; |
| 199 | 199 | struct usb_hcd *primary_hcd; |
| 200 | 200 | |
| 201 | − struct list_head onboard_hub_devs; | |
| 202 | 201 | |
| 203 | 202 | #define HCD_BUFFER_POOLS 4 |
| 204 | 203 | struct dma_pool *pool[HCD_BUFFER_POOLS]; |