Skip to content

Commit

Permalink
usb: hub: Use 'struct usb_hub_device' as hub device's uclass_priv
Browse files Browse the repository at this point in the history 
Use USB hub device's dev->uclass_priv to point to 'usb_hub_device'
so that with driver model usb_hub_reset() and usb_hub_allocate()
are no longer needed.

Signed-off-by: Bin Meng <[email protected]>
Reviewed-by: Simon Glass <[email protected]>
  • Loading branch information
@lbmeng
lbmeng authored and Marek Vasut committed Jul 28, 2017
1 parent 5e94194 commit dfa96e0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
27 changes: 22 additions & 5 deletions common/usb_hub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ struct usb_device_scan {
struct list_head list;
};

/* TODO([email protected]): Remove this when CONFIG_DM_USB is defined */
static struct usb_hub_device hub_dev[USB_MAX_HUB];
static int usb_hub_index;
static LIST_HEAD(usb_scan_list);

__weak void usb_hub_reset_devices(int port)
Expand Down Expand Up @@ -164,6 +161,10 @@ static void usb_hub_power_on(struct usb_hub_device *hub)
max(100, (int)pgood_delay) + 1000);
}

#ifndef CONFIG_DM_USB
static struct usb_hub_device hub_dev[USB_MAX_HUB];
static int usb_hub_index;

void usb_hub_reset(void)
{
usb_hub_index = 0;
Expand All @@ -180,6 +181,7 @@ static struct usb_hub_device *usb_hub_allocate(void)
printf("ERROR: USB_MAX_HUB (%d) reached\n", USB_MAX_HUB);
return NULL;
}
#endif

#define MAX_TRIES 5

Expand Down Expand Up @@ -543,6 +545,20 @@ static int usb_device_list_scan(void)
return ret;
}

static struct usb_hub_device *usb_get_hub_device(struct usb_device *dev)
{
struct usb_hub_device *hub;

#ifndef CONFIG_DM_USB
/* "allocate" Hub device */
hub = usb_hub_allocate();
#else
hub = dev_get_uclass_priv(dev->dev);
#endif

return hub;
}

static int usb_hub_configure(struct usb_device *dev)
{
int i, length;
Expand All @@ -554,11 +570,11 @@ static int usb_hub_configure(struct usb_device *dev)
__maybe_unused struct usb_hub_status *hubsts;
int ret;

/* "allocate" Hub device */
hub = usb_hub_allocate();
hub = usb_get_hub_device(dev);
if (hub == NULL)
return -ENOMEM;
hub->pusb_dev = dev;

/* Get the the hub descriptor */
ret = usb_get_hub_descriptor(dev, buffer, 4);
if (ret < 0) {
Expand Down Expand Up @@ -792,6 +808,7 @@ UCLASS_DRIVER(usb_hub) = {
.child_pre_probe = usb_child_pre_probe,
.per_child_auto_alloc_size = sizeof(struct usb_device),
.per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata),
.per_device_auto_alloc_size = sizeof(struct usb_hub_device),
};

static const struct usb_device_id hub_id_table[] = {
Expand Down
2 changes: 0 additions & 2 deletions drivers/usb/host/usb-uclass.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ int usb_stop(void)
#ifdef CONFIG_USB_STORAGE
usb_stor_reset();
#endif
usb_hub_reset();
uc_priv->companion_device_count = 0;
usb_started = 0;

Expand Down Expand Up @@ -230,7 +229,6 @@ int usb_init(void)
int ret;

asynch_allowed = 1;
usb_hub_reset();

ret = uclass_get(UCLASS_USB, &uc);
if (ret)
Expand Down

0 comments on commit dfa96e0

Please sign in to comment.