[RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi]

PHY layer no longer returns NULL, we must
switch from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
---

Hi Stephen,

I'm waiting for your topic branch before I can merge
this into my 'next' branch.

cheers

 drivers/usb/host/ehci-tegra.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index fafbc81..1d2488c 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -768,14 +768,12 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 		goto fail;
 	}
 
-#if IS_ENABLED(CONFIG_USB_PHY)
 	if (pdata->operating_mode == TEGRA_USB_OTG) {
 		tegra->transceiver =
 			devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-		if (!IS_ERR_OR_NULL(tegra->transceiver))
+		if (!IS_ERR(tegra->transceiver))
 			otg_set_host(tegra->transceiver->otg, &hcd->self);
 	}
-#endif
 
 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (err) {
@@ -794,10 +792,8 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 	return err;
 
 fail:
-#if IS_ENABLED(CONFIG_USB_PHY)
-	if (!IS_ERR_OR_NULL(tegra->transceiver))
+	if (!IS_ERR(tegra->transceiver))
 		otg_set_host(tegra->transceiver->otg, NULL);
-#endif
 	usb_phy_shutdown(hcd->phy);
 fail_io:
 	clk_disable_unprepare(tegra->clk);
@@ -815,10 +811,8 @@ static int tegra_ehci_remove(struct platform_device *pdev)
 	pm_runtime_disable(&pdev->dev);
 	pm_runtime_put_noidle(&pdev->dev);
 
-#if IS_ENABLED(CONFIG_USB_PHY)
-	if (!IS_ERR_OR_NULL(tegra->transceiver))
+	if (!IS_ERR(tegra->transceiver))
 		otg_set_host(tegra->transceiver->otg, NULL);
-#endif
 
 	usb_phy_shutdown(hcd->phy);
 	usb_remove_hcd(hcd);
-- 
1.8.2

Re: [RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Stephen Warren]

On 03/21/2013 06:23 AM, Felipe Balbi wrote:
> PHY layer no longer returns NULL, we must
> switch from IS_ERR_OR_NULL() to IS_ERR().

The patches that I'll put into my topic branch are not yet complete;
Venu first posted them a couple days back and there are a number of
issues that will require a repost.

I would suggest that you apply your patch to your tree, and when Venu
reposts his patches, he'll need to make sure he's rebased on top of this
patch.

Venu, just so you're clear: The device tree changes in your series (the
first 2 or 3 patches) will be applied to a branch based directly to
v3.9-rc1, which will then get merged into both Felipe's USB tree and the
Tegra tree. The USB driver changes in your series will then be applied
to Felipe's USB branch, so please make sure they apply there. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

On Thu, Mar 21, 2013 at 11:19:51AM -0600, Stephen Warren wrote:
> On 03/21/2013 06:23 AM, Felipe Balbi wrote:
> > PHY layer no longer returns NULL, we must
> > switch from IS_ERR_OR_NULL() to IS_ERR().
> 
> The patches that I'll put into my topic branch are not yet complete;
> Venu first posted them a couple days back and there are a number of
> issues that will require a repost.
> 
> I would suggest that you apply your patch to your tree, and when Venu

alright, in that case, can I get yours or Venu's Acked-by ?

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Stephen Warren]

On 03/21/2013 11:31 AM, Felipe Balbi wrote:
> On Thu, Mar 21, 2013 at 11:19:51AM -0600, Stephen Warren wrote:
>> On 03/21/2013 06:23 AM, Felipe Balbi wrote:
>>> PHY layer no longer returns NULL, we must switch from
>>> IS_ERR_OR_NULL() to IS_ERR().
>> 
>> The patches that I'll put into my topic branch are not yet
>> complete; Venu first posted them a couple days back and there are
>> a number of issues that will require a repost.
>> 
>> I would suggest that you apply your patch to your tree, and when
>> Venu
> 
> alright, in that case, can I get yours or Venu's Acked-by ?

Sure,
Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Although I didn't really think through any interactions with Venu's
patch set, I imagine the rebase will be trivial, since the patch is
pretty simple, so it shouldn't cause any issues.

Re: [RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]

On Thu, Mar 21, 2013 at 11:37:08AM -0600, Stephen Warren wrote:
> On 03/21/2013 11:31 AM, Felipe Balbi wrote:
> > On Thu, Mar 21, 2013 at 11:19:51AM -0600, Stephen Warren wrote:
> >> On 03/21/2013 06:23 AM, Felipe Balbi wrote:
> >>> PHY layer no longer returns NULL, we must switch from
> >>> IS_ERR_OR_NULL() to IS_ERR().
> >> 
> >> The patches that I'll put into my topic branch are not yet
> >> complete; Venu first posted them a couple days back and there are
> >> a number of issues that will require a repost.
> >> 
> >> I would suggest that you apply your patch to your tree, and when
> >> Venu
> > 
> > alright, in that case, can I get yours or Venu's Acked-by ?
> 
> Sure,
> Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> Although I didn't really think through any interactions with Venu's
> patch set, I imagine the rebase will be trivial, since the patch is
> pretty simple, so it shouldn't cause any issues.

yeah, I think so too.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]

Hi again,

On Thu, Mar 21, 2013 at 11:19:51AM -0600, Stephen Warren wrote:
> On 03/21/2013 06:23 AM, Felipe Balbi wrote:
> > PHY layer no longer returns NULL, we must
> > switch from IS_ERR_OR_NULL() to IS_ERR().
> 
> The patches that I'll put into my topic branch are not yet complete;
> Venu first posted them a couple days back and there are a number of
> issues that will require a repost.

is your topic branch ready now ? I'm about to close my tree for v3.10,
we already have -rc5 tagged and I want to leave my pull request cooking
in next for a while.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Stephen Warren]

On 04/02/2013 02:36 AM, Felipe Balbi wrote:
> Hi again,
> 
> On Thu, Mar 21, 2013 at 11:19:51AM -0600, Stephen Warren wrote:
>> On 03/21/2013 06:23 AM, Felipe Balbi wrote:
>>> PHY layer no longer returns NULL, we must switch from
>>> IS_ERR_OR_NULL() to IS_ERR().
>> 
>> The patches that I'll put into my topic branch are not yet
>> complete; Venu first posted them a couple days back and there are
>> a number of issues that will require a repost.
> 
> is your topic branch ready now ? I'm about to close my tree for
> v3.10, we already have -rc5 tagged and I want to leave my pull
> request cooking in next for a while.

Unfortunately not.

Venu's patch series had a bunch of runtime bugs, and I also found out
that the DT binding /still/ wasn't fully thought out. As such, this
series won't be applied for 3.10.

I still have a vague (and probably naive) hope that the updated
bindings and DT file modifications can be applied on the Tegra side in
the next few days so that for 3.11 there won't be any inter-tree
dependencies. However, we'll just have to wait and see whether Venu
has found the bugs yet.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1550 bytes --]

Hi,

On Tue, Apr 02, 2013 at 09:33:56AM -0600, Stephen Warren wrote:
> On 04/02/2013 02:36 AM, Felipe Balbi wrote:
> > Hi again,
> > 
> > On Thu, Mar 21, 2013 at 11:19:51AM -0600, Stephen Warren wrote:
> >> On 03/21/2013 06:23 AM, Felipe Balbi wrote:
> >>> PHY layer no longer returns NULL, we must switch from
> >>> IS_ERR_OR_NULL() to IS_ERR().
> >> 
> >> The patches that I'll put into my topic branch are not yet
> >> complete; Venu first posted them a couple days back and there are
> >> a number of issues that will require a repost.
> > 
> > is your topic branch ready now ? I'm about to close my tree for
> > v3.10, we already have -rc5 tagged and I want to leave my pull
> > request cooking in next for a while.
> 
> Unfortunately not.
> 
> Venu's patch series had a bunch of runtime bugs, and I also found out
> that the DT binding /still/ wasn't fully thought out. As such, this
> series won't be applied for 3.10.
> 
> I still have a vague (and probably naive) hope that the updated
> bindings and DT file modifications can be applied on the Tegra side in
> the next few days so that for 3.11 there won't be any inter-tree
> dependencies. However, we'll just have to wait and see whether Venu
> has found the bugs yet.

alright, so I'll go ahead and close my 'next' branch for v3.10,
tomorrow. Leave it in linux-next for a few days and send my pull request
to Greg by Friday.

Let me just check if there are any other important features to go in
v3.10 which won't cause big regressions.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Sergei Shtylyov]

Hello.

On 04/02/2013 07:44 PM, Felipe Balbi wrote:

>>> Hi again,
>>>
>>> On Thu, Mar 21, 2013 at 11:19:51AM -0600, Stephen Warren wrote:
>>>> On 03/21/2013 06:23 AM, Felipe Balbi wrote:
>>>>> PHY layer no longer returns NULL, we must switch from
>>>>> IS_ERR_OR_NULL() to IS_ERR().
>>>> The patches that I'll put into my topic branch are not yet
>>>> complete; Venu first posted them a couple days back and there are
>>>> a number of issues that will require a repost.
>>> is your topic branch ready now ? I'm about to close my tree for
>>> v3.10, we already have -rc5 tagged and I want to leave my pull
>>> request cooking in next for a while.
>> Unfortunately not.
>>
>> Venu's patch series had a bunch of runtime bugs, and I also found out
>> that the DT binding /still/ wasn't fully thought out. As such, this
>> series won't be applied for 3.10.
>>
>> I still have a vague (and probably naive) hope that the updated
>> bindings and DT file modifications can be applied on the Tegra side in
>> the next few days so that for 3.11 there won't be any inter-tree
>> dependencies. However, we'll just have to wait and see whether Venu
>> has found the bugs yet.
> alright, so I'll go ahead and close my 'next' branch for v3.10,
> tomorrow. Leave it in linux-next for a few days and send my pull request
> to Greg by Friday.
>
> Let me just check if there are any other important features to go in
> v3.10 which won't cause big regressions.

    I was going to post some cleanup/features for 
drivers/usb/phy/rcar-phy.c today
or tomorrow. So am I already late for 3.10?

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RESEND/PATCH] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1678 bytes --]

Hi,

On Tue, Apr 02, 2013 at 09:39:57PM +0400, Sergei Shtylyov wrote:
> >>>>On 03/21/2013 06:23 AM, Felipe Balbi wrote:
> >>>>>PHY layer no longer returns NULL, we must switch from
> >>>>>IS_ERR_OR_NULL() to IS_ERR().
> >>>>The patches that I'll put into my topic branch are not yet
> >>>>complete; Venu first posted them a couple days back and there are
> >>>>a number of issues that will require a repost.
> >>>is your topic branch ready now ? I'm about to close my tree for
> >>>v3.10, we already have -rc5 tagged and I want to leave my pull
> >>>request cooking in next for a while.
> >>Unfortunately not.
> >>
> >>Venu's patch series had a bunch of runtime bugs, and I also found out
> >>that the DT binding /still/ wasn't fully thought out. As such, this
> >>series won't be applied for 3.10.
> >>
> >>I still have a vague (and probably naive) hope that the updated
> >>bindings and DT file modifications can be applied on the Tegra side in
> >>the next few days so that for 3.11 there won't be any inter-tree
> >>dependencies. However, we'll just have to wait and see whether Venu
> >>has found the bugs yet.
> >alright, so I'll go ahead and close my 'next' branch for v3.10,
> >tomorrow. Leave it in linux-next for a few days and send my pull request
> >to Greg by Friday.
> >
> >Let me just check if there are any other important features to go in
> >v3.10 which won't cause big regressions.
> 
>    I was going to post some cleanup/features for
> drivers/usb/phy/rcar-phy.c today
> or tomorrow. So am I already late for 3.10?

if it comes today (before midnight in UTC +2, so in less than 3 hours),
I can still apply.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]