|
@@ -98,8 +98,8 @@ static int omap_usb_set_peripheral(struct usb_otg *otg,
|
|
|
|
|
|
static int omap_usb2_suspend(struct usb_phy *x, int suspend)
|
|
|
{
|
|
|
- u32 ret;
|
|
|
struct omap_usb *phy = phy_to_omapusb(x);
|
|
|
+ int ret;
|
|
|
|
|
|
if (suspend && !phy->is_suspended) {
|
|
|
omap_control_usb_phy_power(phy->control_dev, 0);
|
|
@@ -108,8 +108,7 @@ static int omap_usb2_suspend(struct usb_phy *x, int suspend)
|
|
|
} else if (!suspend && phy->is_suspended) {
|
|
|
ret = pm_runtime_get_sync(phy->dev);
|
|
|
if (ret < 0) {
|
|
|
- dev_err(phy->dev, "get_sync failed with err %d\n",
|
|
|
- ret);
|
|
|
+ dev_err(phy->dev, "get_sync failed with err %d\n", ret);
|
|
|
return ret;
|
|
|
}
|
|
|
omap_control_usb_phy_power(phy->control_dev, 1);
|
|
@@ -209,9 +208,9 @@ static int omap_usb2_runtime_suspend(struct device *dev)
|
|
|
|
|
|
static int omap_usb2_runtime_resume(struct device *dev)
|
|
|
{
|
|
|
- u32 ret = 0;
|
|
|
struct platform_device *pdev = to_platform_device(dev);
|
|
|
struct omap_usb *phy = platform_get_drvdata(pdev);
|
|
|
+ int ret;
|
|
|
|
|
|
ret = clk_enable(phy->wkupclk);
|
|
|
if (ret < 0) {
|