diff options
| author | Kishon Vijay Abraham I <kishon@ti.com> | 2014-03-03 06:38:13 -0500 |
|---|---|---|
| committer | Kishon Vijay Abraham I <kishon@ti.com> | 2014-03-06 04:19:33 -0500 |
| commit | 8cf7651f7046aa4e20bb98c36bec3ddba48351f9 (patch) | |
| tree | 1c432b71837a1d0c368781952f24870b9c7726dc | |
| parent | a70143bbef6bf06050c32a26d99e917b3e82deb7 (diff) | |
usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
Now that omap-usb2 is adapted to the new generic PHY framework,
*set_suspend* ops can be removed from omap-usb2 driver.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
| -rw-r--r-- | drivers/phy/phy-omap-usb2.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c index 7699752fba11..705af5a11fb9 100644 --- a/drivers/phy/phy-omap-usb2.c +++ b/drivers/phy/phy-omap-usb2.c | |||
| @@ -98,28 +98,6 @@ static int omap_usb_set_peripheral(struct usb_otg *otg, | |||
| 98 | return 0; | 98 | return 0; |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static int omap_usb2_suspend(struct usb_phy *x, int suspend) | ||
| 102 | { | ||
| 103 | struct omap_usb *phy = phy_to_omapusb(x); | ||
| 104 | int ret; | ||
| 105 | |||
| 106 | if (suspend && !phy->is_suspended) { | ||
| 107 | omap_control_usb_phy_power(phy->control_dev, 0); | ||
| 108 | pm_runtime_put_sync(phy->dev); | ||
| 109 | phy->is_suspended = 1; | ||
| 110 | } else if (!suspend && phy->is_suspended) { | ||
| 111 | ret = pm_runtime_get_sync(phy->dev); | ||
| 112 | if (ret < 0) { | ||
| 113 | dev_err(phy->dev, "get_sync failed with err %d\n", ret); | ||
| 114 | return ret; | ||
| 115 | } | ||
| 116 | omap_control_usb_phy_power(phy->control_dev, 1); | ||
| 117 | phy->is_suspended = 0; | ||
| 118 | } | ||
| 119 | |||
| 120 | return 0; | ||
| 121 | } | ||
| 122 | |||
| 123 | static int omap_usb_power_off(struct phy *x) | 101 | static int omap_usb_power_off(struct phy *x) |
| 124 | { | 102 | { |
| 125 | struct omap_usb *phy = phy_get_drvdata(x); | 103 | struct omap_usb *phy = phy_get_drvdata(x); |
| @@ -173,7 +151,6 @@ static int omap_usb2_probe(struct platform_device *pdev) | |||
| 173 | 151 | ||
| 174 | phy->phy.dev = phy->dev; | 152 | phy->phy.dev = phy->dev; |
| 175 | phy->phy.label = "omap-usb2"; | 153 | phy->phy.label = "omap-usb2"; |
| 176 | phy->phy.set_suspend = omap_usb2_suspend; | ||
| 177 | phy->phy.otg = otg; | 154 | phy->phy.otg = otg; |
| 178 | phy->phy.type = USB_PHY_TYPE_USB2; | 155 | phy->phy.type = USB_PHY_TYPE_USB2; |
| 179 | 156 | ||
| @@ -190,8 +167,6 @@ static int omap_usb2_probe(struct platform_device *pdev) | |||
| 190 | } | 167 | } |
| 191 | 168 | ||
| 192 | phy->control_dev = &control_pdev->dev; | 169 | phy->control_dev = &control_pdev->dev; |
| 193 | |||
| 194 | phy->is_suspended = 1; | ||
| 195 | omap_control_usb_phy_power(phy->control_dev, 0); | 170 | omap_control_usb_phy_power(phy->control_dev, 0); |
| 196 | 171 | ||
| 197 | otg->set_host = omap_usb_set_host; | 172 | otg->set_host = omap_usb_set_host; |
