From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>, <kyungmin.park@samsung.com>,
<balbi@ti.com>, <kishon@ti.com>, <jg1.han@samsung.com>,
<s.nawrocki@samsung.com>, <kgene.kim@samsung.com>,
<stern@rowland.harvard.edu>, <broonie@kernel.org>,
<tomasz.figa@gmail.com>, <arnd@arndb.de>
Cc: <grant.likely@linaro.org>, <tony@atomide.com>,
<swarren@nvidia.com>, <devicetree@vger.kernel.org>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-samsung-soc@vger.kernel.org>, <linux-omap@vger.kernel.org>,
<linux-usb@vger.kernel.org>, <linux-media@vger.kernel.org>,
<linux-fbdev@vger.kernel.org>, <akpm@linux-foundation.org>,
<balajitk@ti.com>, <george.cherian@ti.com>, <nsekhar@ti.com>,
<linux@arm.linux.org.uk>
Subject: [PATCH v11 7/8] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
Date: Wed, 21 Aug 2013 11:16:12 +0530 [thread overview]
Message-ID: <1377063973-22044-8-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1377063973-22044-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>
---
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 25e0f3c..dec3fab 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -97,29 +97,6 @@ static int omap_usb_set_peripheral(struct usb_otg *otg,
return 0;
}
-static int omap_usb2_suspend(struct usb_phy *x, int suspend)
-{
- u32 ret;
- struct omap_usb *phy = phy_to_omapusb(x);
-
- 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);
@@ -167,7 +144,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;
@@ -182,7 +158,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
return -ENODEV;
}
- phy->is_suspended = 1;
omap_control_usb_phy_power(phy->control_dev, 0);
otg->set_host = omap_usb_set_host;
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: Kishon Vijay Abraham I <kishon@ti.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v11 7/8] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
Date: Wed, 21 Aug 2013 05:58:12 +0000 [thread overview]
Message-ID: <1377063973-22044-8-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1377063973-22044-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>
---
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 25e0f3c..dec3fab 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -97,29 +97,6 @@ static int omap_usb_set_peripheral(struct usb_otg *otg,
return 0;
}
-static int omap_usb2_suspend(struct usb_phy *x, int suspend)
-{
- u32 ret;
- struct omap_usb *phy = phy_to_omapusb(x);
-
- 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);
@@ -167,7 +144,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;
@@ -182,7 +158,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
return -ENODEV;
}
- phy->is_suspended = 1;
omap_control_usb_phy_power(phy->control_dev, 0);
otg->set_host = omap_usb_set_host;
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: Kishon Vijay Abraham I <kishon@ti.com>
To: gregkh@linuxfoundation.org, kyungmin.park@samsung.com,
balbi@ti.com, kishon@ti.com, jg1.han@samsung.com,
s.nawrocki@samsung.com, kgene.kim@samsung.com,
stern@rowland.harvard.edu, broonie@kernel.org,
tomasz.figa@gmail.com, arnd@arndb.de
Cc: grant.likely@linaro.org, tony@atomide.com, swarren@nvidia.com,
devicetree@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-omap@vger.kernel.org,
linux-usb@vger.kernel.org, linux-media@vger.kernel.org,
linux-fbdev@vger.kernel.org, akpm@linux-foundation.org,
balajitk@ti.com, george.cherian@ti.com, nsekhar@ti.com,
linux@arm.linux.org.uk
Subject: [PATCH v11 7/8] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
Date: Wed, 21 Aug 2013 11:16:12 +0530 [thread overview]
Message-ID: <1377063973-22044-8-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1377063973-22044-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>
---
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 25e0f3c..dec3fab 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -97,29 +97,6 @@ static int omap_usb_set_peripheral(struct usb_otg *otg,
return 0;
}
-static int omap_usb2_suspend(struct usb_phy *x, int suspend)
-{
- u32 ret;
- struct omap_usb *phy = phy_to_omapusb(x);
-
- 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);
@@ -167,7 +144,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;
@@ -182,7 +158,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
return -ENODEV;
}
- phy->is_suspended = 1;
omap_control_usb_phy_power(phy->control_dev, 0);
otg->set_host = omap_usb_set_host;
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: kishon@ti.com (Kishon Vijay Abraham I)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v11 7/8] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2
Date: Wed, 21 Aug 2013 11:16:12 +0530 [thread overview]
Message-ID: <1377063973-22044-8-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1377063973-22044-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>
---
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 25e0f3c..dec3fab 100644
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -97,29 +97,6 @@ static int omap_usb_set_peripheral(struct usb_otg *otg,
return 0;
}
-static int omap_usb2_suspend(struct usb_phy *x, int suspend)
-{
- u32 ret;
- struct omap_usb *phy = phy_to_omapusb(x);
-
- 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);
@@ -167,7 +144,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;
@@ -182,7 +158,6 @@ static int omap_usb2_probe(struct platform_device *pdev)
return -ENODEV;
}
- 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-08-21 5:47 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 5:46 [PATCH v11 0/8] PHY framework Kishon Vijay Abraham I
2013-08-21 5:58 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` [PATCH v11 1/8] drivers: phy: add generic " Kishon Vijay Abraham I
2013-08-21 5:58 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` [PATCH v11 2/8] usb: phy: omap-usb2: use the new " Kishon Vijay Abraham I
2013-08-21 5:58 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-09-26 18:51 ` Greg KH
2013-09-26 18:51 ` Greg KH
2013-09-26 18:51 ` Greg KH
2013-09-26 18:51 ` Greg KH
2013-09-27 6:35 ` Kishon Vijay Abraham I
2013-09-27 6:47 ` Kishon Vijay Abraham I
2013-09-27 6:35 ` Kishon Vijay Abraham I
2013-09-27 6:35 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` [PATCH v11 3/8] usb: phy: twl4030: " Kishon Vijay Abraham I
2013-08-21 5:58 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` [PATCH v11 4/8] arm: omap3: twl: add phy consumer data in twl4030_usb_data Kishon Vijay Abraham I
2013-08-21 5:58 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` [PATCH v11 5/8] ARM: dts: omap: update usb_otg_hs data Kishon Vijay Abraham I
2013-08-21 5:58 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` [PATCH v11 6/8] usb: musb: omap2430: use the new generic PHY framework Kishon Vijay Abraham I
2013-08-21 5:58 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I [this message]
2013-08-21 5:58 ` [PATCH v11 7/8] usb: phy: omap-usb2: remove *set_suspend* callback from omap-usb2 Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` [PATCH v11 8/8] usb: phy: twl4030-usb: remove *set_suspend* and *phy_init* ops Kishon Vijay Abraham I
2013-08-21 5:58 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-21 5:46 ` Kishon Vijay Abraham I
2013-08-26 8:14 ` [PATCH v11 0/8] PHY framework Kishon Vijay Abraham I
2013-08-26 8:26 ` Kishon Vijay Abraham I
2013-08-26 8:14 ` Kishon Vijay Abraham I
2013-08-26 8:14 ` Kishon Vijay Abraham I
2013-08-27 19:20 ` Felipe Balbi
2013-08-27 19:20 ` Felipe Balbi
2013-08-27 19:20 ` Felipe Balbi
2013-08-27 19:20 ` Felipe Balbi
2013-08-28 10:43 ` Kishon Vijay Abraham I
2013-08-28 10:55 ` Kishon Vijay Abraham I
2013-08-28 10:43 ` Kishon Vijay Abraham I
2013-08-28 10:43 ` Kishon Vijay Abraham I
2013-09-03 15:25 ` Kishon Vijay Abraham I
2013-09-03 15:37 ` Kishon Vijay Abraham I
2013-09-03 15:25 ` Kishon Vijay Abraham I
2013-09-03 15:25 ` Kishon Vijay Abraham I
2013-09-03 15:50 ` Greg KH
2013-09-03 15:50 ` Greg KH
2013-09-03 15:50 ` Greg KH
2013-09-03 15:50 ` Greg KH
2013-09-04 8:57 ` Kishon Vijay Abraham I
2013-09-04 8:58 ` Kishon Vijay Abraham I
2013-09-04 8:57 ` Kishon Vijay Abraham I
2013-09-04 8:57 ` Kishon Vijay Abraham I
2013-09-17 15:41 ` Felipe Balbi
2013-09-17 15:41 ` Felipe Balbi
2013-09-17 15:41 ` Felipe Balbi
2013-09-17 15:41 ` Felipe Balbi
2013-09-20 5:34 ` Kishon Vijay Abraham I
2013-09-20 5:46 ` Kishon Vijay Abraham I
2013-09-20 5:34 ` Kishon Vijay Abraham I
2013-09-20 5:34 ` Kishon Vijay Abraham I
2013-09-20 6:07 ` Greg KH
2013-09-20 6:07 ` Greg KH
2013-09-20 6:07 ` Greg KH
2013-09-20 6:07 ` Greg KH
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=1377063973-22044-8-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=balajitk@ti.com \
--cc=balbi@ti.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=george.cherian@ti.com \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jg1.han@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nsekhar@ti.com \
--cc=s.nawrocki@samsung.com \
--cc=stern@rowland.harvard.edu \
--cc=swarren@nvidia.com \
--cc=tomasz.figa@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.