* [PATCH v3] stmmac: fix check for phydev being open
@ 2015-09-08 8:43 Alexey Brodkin
2015-09-08 11:20 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Alexey Brodkin @ 2015-09-08 8:43 UTC (permalink / raw)
To: netdev
Cc: Alexey Brodkin, Sergei Shtylyov, Giuseppe Cavallaro, linux-kernel,
stable, David Miller
Current check of phydev with IS_ERR(phydev) may make not much sense
because of_phy_connect() returns NULL on failure instead of error value.
Still for checking result of phy_connect() IS_ERR() makes perfect sense.
So let's use combined check IS_ERR_OR_NULL() that covers both cases.
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
---
Changes compared to v2:
* Updated commit message with mention of of_phy_connect() instead of
of_phy_attach().
* Return ENODEV in case of of_phy_connect() failure
Changes compared to v1:
* Use IS_ERR_OR_NULL() instead of discrete checks for null and err
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 864b476..e2c9c86 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -837,9 +837,12 @@ static int stmmac_init_phy(struct net_device *dev)
interface);
}
- if (IS_ERR(phydev)) {
+ if (IS_ERR_OR_NULL(phydev)) {
pr_err("%s: Could not attach to PHY\n", dev->name);
- return PTR_ERR(phydev);
+ if (!phydev)
+ return -ENODEV;
+ else
+ return PTR_ERR(phydev);
}
/* Stop Advertising 1000BASE Capability if interface is not GMII */
--
2.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v3] stmmac: fix check for phydev being open
2015-09-08 8:43 [PATCH v3] stmmac: fix check for phydev being open Alexey Brodkin
@ 2015-09-08 11:20 ` Sergei Shtylyov
2015-09-08 12:46 ` Alexey Brodkin
0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2015-09-08 11:20 UTC (permalink / raw)
To: Alexey Brodkin, netdev
Cc: Giuseppe Cavallaro, linux-kernel, stable, David Miller
Hello.
On 9/8/2015 11:43 AM, Alexey Brodkin wrote:
> Current check of phydev with IS_ERR(phydev) may make not much sense
> because of_phy_connect() returns NULL on failure instead of error value.
>
> Still for checking result of phy_connect() IS_ERR() makes perfect sense.
>
> So let's use combined check IS_ERR_OR_NULL() that covers both cases.
>
> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: stable@vger.kernel.org
> Cc: David Miller <davem@davemloft.net>
> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> ---
>
> Changes compared to v2:
> * Updated commit message with mention of of_phy_connect() instead of
> of_phy_attach().
> * Return ENODEV in case of of_phy_connect() failure
>
> Changes compared to v1:
> * Use IS_ERR_OR_NULL() instead of discrete checks for null and err
>
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 864b476..e2c9c86 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -837,9 +837,12 @@ static int stmmac_init_phy(struct net_device *dev)
> interface);
> }
>
> - if (IS_ERR(phydev)) {
> + if (IS_ERR_OR_NULL(phydev)) {
> pr_err("%s: Could not attach to PHY\n", dev->name);
> - return PTR_ERR(phydev);
> + if (!phydev)
> + return -ENODEV;
> + else
> + return PTR_ERR(phydev);
Don't need *else* after *return* and scripts/checkpatch.pl should have
complained about that.
MBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] stmmac: fix check for phydev being open
2015-09-08 11:20 ` Sergei Shtylyov
@ 2015-09-08 12:46 ` Alexey Brodkin
2015-09-08 19:53 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Alexey Brodkin @ 2015-09-08 12:46 UTC (permalink / raw)
To: sergei.shtylyov@cogentembedded.com
Cc: linux-kernel@vger.kernel.org, davem@davemloft.net,
stable@vger.kernel.org, peppe.cavallaro@st.com,
netdev@vger.kernel.org
Hi Sergei,
On Tue, 2015-09-08 at 14:20 +0300, Sergei Shtylyov wrote:
> Hello.
>
> On 9/8/2015 11:43 AM, Alexey Brodkin wrote:
>
> > Current check of phydev with IS_ERR(phydev) may make not much sense
> > because of_phy_connect() returns NULL on failure instead of error value.
> >
> > Still for checking result of phy_connect() IS_ERR() makes perfect sense.
> >
> > So let's use combined check IS_ERR_OR_NULL() that covers both cases.
> >
> > Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> > Cc: linux-kernel@vger.kernel.org
> > Cc: stable@vger.kernel.org
> > Cc: David Miller <davem@davemloft.net>
> > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> > ---
> >
> > Changes compared to v2:
> > * Updated commit message with mention of of_phy_connect() instead of
> > of_phy_attach().
> > * Return ENODEV in case of of_phy_connect() failure
> >
> > Changes compared to v1:
> > * Use IS_ERR_OR_NULL() instead of discrete checks for null and err
> >
> > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++--
> > 1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > index 864b476..e2c9c86 100644
> > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > @@ -837,9 +837,12 @@ static int stmmac_init_phy(struct net_device *dev)
> > interface);
> > }
> >
> > - if (IS_ERR(phydev)) {
> > + if (IS_ERR_OR_NULL(phydev)) {
> > pr_err("%s: Could not attach to PHY\n", dev->name);
> > - return PTR_ERR(phydev);
> > + if (!phydev)
> > + return -ENODEV;
> > + else
> > + return PTR_ERR(phydev);
>
> Don't need *else* after *return* and scripts/checkpatch.pl should have
> complained about that.
./scripts/checkpatch.pl 0001-stmmac-fix-check-for-phydev-being-open.patch
total: 0 errors, 0 warnings, 0 checks, 14 lines checked
-Alexey
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] stmmac: fix check for phydev being open
2015-09-08 12:46 ` Alexey Brodkin
@ 2015-09-08 19:53 ` Sergei Shtylyov
2015-09-09 14:44 ` Alexey Brodkin
0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2015-09-08 19:53 UTC (permalink / raw)
To: Alexey Brodkin
Cc: linux-kernel@vger.kernel.org, davem@davemloft.net,
stable@vger.kernel.org, peppe.cavallaro@st.com,
netdev@vger.kernel.org
Hello.
On 09/08/2015 03:46 PM, Alexey Brodkin wrote:
>>> Current check of phydev with IS_ERR(phydev) may make not much sense
>>> because of_phy_connect() returns NULL on failure instead of error value.
>>>
>>> Still for checking result of phy_connect() IS_ERR() makes perfect sense.
>>>
>>> So let's use combined check IS_ERR_OR_NULL() that covers both cases.
>>>
>>> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
>>> Cc: linux-kernel@vger.kernel.org
>>> Cc: stable@vger.kernel.org
>>> Cc: David Miller <davem@davemloft.net>
>>> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
>>> ---
>>>
>>> Changes compared to v2:
>>> * Updated commit message with mention of of_phy_connect() instead of
>>> of_phy_attach().
>>> * Return ENODEV in case of of_phy_connect() failure
>>>
>>> Changes compared to v1:
>>> * Use IS_ERR_OR_NULL() instead of discrete checks for null and err
>>>
>>> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++--
>>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>>> index 864b476..e2c9c86 100644
>>> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>>> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
>>> @@ -837,9 +837,12 @@ static int stmmac_init_phy(struct net_device *dev)
>>> interface);
>>> }
>>>
>>> - if (IS_ERR(phydev)) {
>>> + if (IS_ERR_OR_NULL(phydev)) {
>>> pr_err("%s: Could not attach to PHY\n", dev->name);
>>> - return PTR_ERR(phydev);
>>> + if (!phydev)
>>> + return -ENODEV;
>>> + else
>>> + return PTR_ERR(phydev);
>>
>> Don't need *else* after *return* and scripts/checkpatch.pl should have
>> complained about that.
>
> ./scripts/checkpatch.pl 0001-stmmac-fix-check-for-phydev-being-open.patch
> total: 0 errors, 0 warnings, 0 checks, 14 lines checked
Hm... I bet I saw such warning from checkpatch.pl recently (it was a false
positive though, so maybe the check was removed recently, not sure). Your
patch is clean indeed, however my comment is still valid.
> -Alexey
MBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] stmmac: fix check for phydev being open
2015-09-08 19:53 ` Sergei Shtylyov
@ 2015-09-09 14:44 ` Alexey Brodkin
0 siblings, 0 replies; 5+ messages in thread
From: Alexey Brodkin @ 2015-09-09 14:44 UTC (permalink / raw)
To: sergei.shtylyov@cogentembedded.com
Cc: linux-kernel@vger.kernel.org, davem@davemloft.net,
stable@vger.kernel.org, peppe.cavallaro@st.com,
netdev@vger.kernel.org
Hi Sergei,
On Tue, 2015-09-08 at 22:53 +0300, Sergei Shtylyov wrote:
> Hello.
>
> On 09/08/2015 03:46 PM, Alexey Brodkin wrote:
>
> > > > Current check of phydev with IS_ERR(phydev) may make not much sense
> > > > because of_phy_connect() returns NULL on failure instead of error value.
> > > >
> > > > Still for checking result of phy_connect() IS_ERR() makes perfect sense.
> > > >
> > > > So let's use combined check IS_ERR_OR_NULL() that covers both cases.
> > > >
> > > > Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > > > Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> > > > Cc: linux-kernel@vger.kernel.org
> > > > Cc: stable@vger.kernel.org
> > > > Cc: David Miller <davem@davemloft.net>
> > > > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> > > > ---
> > > >
> > > > Changes compared to v2:
> > > > * Updated commit message with mention of of_phy_connect() instead of
> > > > of_phy_attach().
> > > > * Return ENODEV in case of of_phy_connect() failure
> > > >
> > > > Changes compared to v1:
> > > > * Use IS_ERR_OR_NULL() instead of discrete checks for null and err
> > > >
> > > > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +++++--
> > > > 1 file changed, 5 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > > > b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > > > index 864b476..e2c9c86 100644
> > > > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > > > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > > > @@ -837,9 +837,12 @@ static int stmmac_init_phy(struct net_device *dev)
> > > > interface);
> > > > }
> > > >
> > > > - if (IS_ERR(phydev)) {
> > > > + if (IS_ERR_OR_NULL(phydev)) {
> > > > pr_err("%s: Could not attach to PHY\n", dev->name);
> > > > - return PTR_ERR(phydev);
> > > > + if (!phydev)
> > > > + return -ENODEV;
> > > > + else
> > > > + return PTR_ERR(phydev);
> > >
> > > Don't need *else* after *return* and scripts/checkpatch.pl should have
> > > complained about that.
> >
> > ./scripts/checkpatch.pl 0001-stmmac-fix-check-for-phydev-being-open.patch
> > total: 0 errors, 0 warnings, 0 checks, 14 lines checked
>
> Hm... I bet I saw such warning from checkpatch.pl recently (it was a false
> positive though, so maybe the check was removed recently, not sure). Your
> patch is clean indeed, however my comment is still valid.
Ok, let me send another respin then.
-Alexey
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-09-09 14:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-08 8:43 [PATCH v3] stmmac: fix check for phydev being open Alexey Brodkin
2015-09-08 11:20 ` Sergei Shtylyov
2015-09-08 12:46 ` Alexey Brodkin
2015-09-08 19:53 ` Sergei Shtylyov
2015-09-09 14:44 ` Alexey Brodkin
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).