Skip to content

Commit

Permalink
usb: dwc2: remove no longer needed init_mutex
Browse files Browse the repository at this point in the history
init_mutex is a leftover from the time, when s3c-hsotg driver did not
implement proper pull up/down control and emulated it by enabling
enabling/disabling usb phy. Proper pull up/down control has been added
by commit 5b9451f ("usb: dwc2: gadget:
use soft-disconnect udc feature in pullup() method"), so init_muxtex can
be removed now to avoid potential deadlocks with other locks.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: John Youn <johnyoun@synopsys.com>
Tested-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Marek Szyprowski authored and Felipe Balbi committed Oct 14, 2015
1 parent 145f48c commit 758ed19
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 19 deletions.
1 change: 0 additions & 1 deletion drivers/usb/dwc2/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,6 @@ struct dwc2_hsotg {
struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)];

spinlock_t lock;
struct mutex init_mutex;
void *priv;
int irq;
struct clk *clk;
Expand Down
17 changes: 0 additions & 17 deletions drivers/usb/dwc2/gadget.c
Original file line number Diff line number Diff line change
Expand Up @@ -3193,7 +3193,6 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget,
return -EINVAL;
}

mutex_lock(&hsotg->init_mutex);
WARN_ON(hsotg->driver);

driver->driver.bus = NULL;
Expand All @@ -3220,12 +3219,9 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget,

dev_info(hsotg->dev, "bound driver %s\n", driver->driver.name);

mutex_unlock(&hsotg->init_mutex);

return 0;

err:
mutex_unlock(&hsotg->init_mutex);
hsotg->driver = NULL;
return ret;
}
Expand All @@ -3246,8 +3242,6 @@ static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget)
if (!hsotg)
return -ENODEV;

mutex_lock(&hsotg->init_mutex);

/* all endpoints should be shutdown */
for (ep = 1; ep < hsotg->num_of_eps; ep++) {
if (hsotg->eps_in[ep])
Expand All @@ -3270,8 +3264,6 @@ static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget)

regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);

mutex_unlock(&hsotg->init_mutex);

return 0;
}

Expand Down Expand Up @@ -3307,7 +3299,6 @@ static int dwc2_hsotg_pullup(struct usb_gadget *gadget, int is_on)
return 0;
}

mutex_lock(&hsotg->init_mutex);
spin_lock_irqsave(&hsotg->lock, flags);
if (is_on) {
hsotg->enabled = 1;
Expand All @@ -3321,7 +3312,6 @@ static int dwc2_hsotg_pullup(struct usb_gadget *gadget, int is_on)

hsotg->gadget.speed = USB_SPEED_UNKNOWN;
spin_unlock_irqrestore(&hsotg->lock, flags);
mutex_unlock(&hsotg->init_mutex);

return 0;
}
Expand Down Expand Up @@ -3832,8 +3822,6 @@ int dwc2_hsotg_suspend(struct dwc2_hsotg *hsotg)
if (hsotg->lx_state != DWC2_L0)
return ret;

mutex_lock(&hsotg->init_mutex);

if (hsotg->driver) {
int ep;

Expand Down Expand Up @@ -3861,8 +3849,6 @@ int dwc2_hsotg_suspend(struct dwc2_hsotg *hsotg)
clk_disable(hsotg->clk);
}

mutex_unlock(&hsotg->init_mutex);

return ret;
}

Expand All @@ -3874,8 +3860,6 @@ int dwc2_hsotg_resume(struct dwc2_hsotg *hsotg)
if (hsotg->lx_state == DWC2_L2)
return ret;

mutex_lock(&hsotg->init_mutex);

if (hsotg->driver) {
dev_info(hsotg->dev, "resuming usb gadget %s\n",
hsotg->driver->driver.name);
Expand All @@ -3892,7 +3876,6 @@ int dwc2_hsotg_resume(struct dwc2_hsotg *hsotg)
dwc2_hsotg_core_connect(hsotg);
spin_unlock_irqrestore(&hsotg->lock, flags);
}
mutex_unlock(&hsotg->init_mutex);

return ret;
}
1 change: 0 additions & 1 deletion drivers/usb/dwc2/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ static int dwc2_driver_probe(struct platform_device *dev)
}

spin_lock_init(&hsotg->lock);
mutex_init(&hsotg->init_mutex);

/* Detect config values from hardware */
retval = dwc2_get_hwparams(hsotg);
Expand Down

0 comments on commit 758ed19

Please sign in to comment.