From d4b438c3fb78aefb2009d49b0532403ac2289b6a Mon Sep 17 00:00:00 2001 From: Kishon Vijay Abraham I Date: Fri, 15 Mar 2013 18:58:52 +0530 Subject: [PATCH] --- yaml --- r: 364739 b: refs/heads/master c: 817e5f33d0c12f24bdfebe88c96ca2e968756da4 h: refs/heads/master i: 364737: 071260ea76f83fa070e0833f10db0e0d61fa20a3 364735: 8697e020f9b70433e109146852688e1a8c4bc37f v: v3 --- [refs] | 2 +- trunk/drivers/usb/phy/phy-twl4030-usb.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b4388cfa425d..f101f8cfa100 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9166902c435b4847c1987188294407b24e76d9e6 +refs/heads/master: 817e5f33d0c12f24bdfebe88c96ca2e968756da4 diff --git a/trunk/drivers/usb/phy/phy-twl4030-usb.c b/trunk/drivers/usb/phy/phy-twl4030-usb.c index e14b03e7ad70..1986c782346f 100644 --- a/trunk/drivers/usb/phy/phy-twl4030-usb.c +++ b/trunk/drivers/usb/phy/phy-twl4030-usb.c @@ -510,8 +510,9 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl) return IRQ_HANDLED; } -static void twl4030_usb_phy_init(struct twl4030_usb *twl) +static int twl4030_usb_phy_init(struct usb_phy *phy) { + struct twl4030_usb *twl = phy_to_twl(phy); enum omap_musb_vbus_id_status status; status = twl4030_usb_linkstat(twl); @@ -528,6 +529,7 @@ static void twl4030_usb_phy_init(struct twl4030_usb *twl) omap_musb_mailbox(twl->linkstat); } sysfs_notify(&twl->dev->kobj, NULL, "vbus"); + return 0; } static int twl4030_set_suspend(struct usb_phy *x, int suspend) @@ -604,6 +606,7 @@ static int twl4030_usb_probe(struct platform_device *pdev) twl->phy.otg = otg; twl->phy.type = USB_PHY_TYPE_USB2; twl->phy.set_suspend = twl4030_set_suspend; + twl->phy.init = twl4030_usb_phy_init; otg->phy = &twl->phy; otg->set_host = twl4030_set_host; @@ -641,11 +644,6 @@ static int twl4030_usb_probe(struct platform_device *pdev) return status; } - /* Power down phy or make it work according to - * current link state. - */ - twl4030_usb_phy_init(twl); - dev_info(&pdev->dev, "Initialized TWL4030 USB module\n"); return 0; }