From: Kishon Vijay Abraham I <kishon@ti.com>
To: kishon@ti.com, balbi@ti.com, gregkh@linuxfoundation.org
Cc: rob.herring@calxeda.com, pawel.moll@arm.com,
mark.rutland@arm.com, swarren@wwwdotorg.org,
ijc+devicetree@hellion.org.uk, rob@landley.net,
bcousson@baylibre.com, tony@atomide.com, linux@arm.linux.org.uk,
grant.likely@linaro.org, s.nawrocki@samsung.com,
galak@codeaurora.org, devicetree@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-usb@vger.kernel.org
Subject: [PATCH v2 5/7] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
Date: Wed, 16 Oct 2013 01:24:15 +0530 [thread overview]
Message-ID: <1381866857-3861-6-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1381866857-3861-1-git-send-email-kishon@ti.com>
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>
---
This patch was deferred from Generic PHY framework series since dwc3 uses the
same driver and it has to be adapted to the Generic PHY Framework.
drivers/phy/phy-omap-usb2.c | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index bfc5c33..9b3e867 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,
return 0;
}
-static int omap_usb2_suspend(struct usb_phy *x, int suspend)
-{
- struct omap_usb *phy = phy_to_omapusb(x);
- int ret;
-
- if (suspend && !phy->is_suspended) {
- omap_control_usb_phy_power(phy->control_dev, 0);
- pm_runtime_put_sync(phy->dev);
- phy->is_suspended = 1;
- } 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);
- return ret;
- }
- omap_control_usb_phy_power(phy->control_dev, 1);
- phy->is_suspended = 0;
- }
-
- return 0;
-}
-
static int omap_usb_power_off(struct phy *x)
{
struct omap_usb *phy = phy_get_drvdata(x);
@@ -173,7 +151,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
phy->phy.dev = phy->dev;
phy->phy.label = "omap-usb2";
- phy->phy.set_suspend = omap_usb2_suspend;
phy->phy.otg = otg;
phy->phy.type = USB_PHY_TYPE_USB2;
@@ -195,8 +172,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
}
phy->control_dev = &control_pdev->dev;
-
- phy->is_suspended = 1;
omap_control_usb_phy_power(phy->control_dev, 0);
otg->set_host = omap_usb_set_host;
--
1.7.10.4
next prev parent reply other threads:[~2013-10-15 19:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-15 19:54 [PATCH v2 0/7] Make dwc3 use Generic PHY Framework Kishon Vijay Abraham I
2013-10-15 19:54 ` [PATCH v2 1/7] usb: dwc3: get "usb_phy" only if the platform indicates the presence of PHY's Kishon Vijay Abraham I
2013-10-16 13:03 ` Roger Quadros
2013-10-16 13:10 ` Kishon Vijay Abraham I
2013-10-16 13:27 ` Roger Quadros
2013-10-17 14:54 ` Felipe Balbi
2013-12-03 10:39 ` Heikki Krogerus
2013-12-06 20:15 ` Felipe Balbi
2013-12-09 8:52 ` Heikki Krogerus
2013-12-12 18:27 ` Felipe Balbi
2013-11-05 18:11 ` Vivek Gautam
2013-11-05 18:12 ` Vivek Gautam
2013-10-17 16:38 ` Felipe Balbi
2013-10-21 11:56 ` Kishon Vijay Abraham I
2013-11-11 14:36 ` Kishon Vijay Abraham I
2013-11-25 21:32 ` Felipe Balbi
2013-12-03 9:50 ` Kishon Vijay Abraham I
2013-10-15 19:54 ` [PATCH v2 2/7] usb: dwc3: adapt dwc3 core to use Generic PHY Framework Kishon Vijay Abraham I
2013-10-16 13:18 ` Roger Quadros
2013-10-16 13:52 ` Kishon Vijay Abraham I
2013-10-16 14:23 ` Roger Quadros
2013-10-21 11:55 ` Kishon Vijay Abraham I
2013-10-21 12:13 ` Roger Quadros
[not found] ` <1381866857-3861-3-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2013-12-03 11:59 ` Heikki Krogerus
2013-12-03 14:13 ` Kishon Vijay Abraham I
2013-10-15 19:54 ` [PATCH v2 3/7] Documentation: dt bindings: move ..usb/usb-phy.txt to ..phy/ti-phy.txt Kishon Vijay Abraham I
2013-10-15 19:54 ` [PATCH v2 4/7] drivers: phy: usb3/pipe3: Adapt pipe3 driver to Generic PHY Framework Kishon Vijay Abraham I
2013-10-16 13:40 ` Roger Quadros
2013-10-21 12:53 ` Kishon Vijay Abraham I
2013-10-15 19:54 ` Kishon Vijay Abraham I [this message]
2013-10-15 19:54 ` [PATCH v2 6/7] phy: omap-usb2: move omap_usb.h from linux/usb/ to linux/phy/ Kishon Vijay Abraham I
2013-10-15 19:54 ` [PATCH v2 7/7] arm/dts: added dt properties to adapt to the new phy framwork Kishon Vijay Abraham I
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381866857-3861-6-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=s.nawrocki@samsung.com \
--cc=swarren@wwwdotorg.org \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).