From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Alexey Brodkin <Alexey.Brodkin@synopsys.com>, netdev@vger.kernel.org
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
David Miller <davem@davemloft.net>
Subject: Re: [PATCH v2] stmmac: fix check for phydev being open
Date: Mon, 7 Sep 2015 23:53:04 +0300 [thread overview]
Message-ID: <55EDF930.10601@cogentembedded.com> (raw)
In-Reply-To: <1441659019-25522-1-git-send-email-abrodkin@synopsys.com>
On 09/07/2015 11:50 PM, Alexey Brodkin wrote:
> Current implementation via IS_ERR(phydev) may make no sense because
> of_phy_attach() returns NULL on failure instead of error value.
>
> Still for checking result of phy_connect() IS_ERR() is useful.
>
> To address both situations we use combined IS_ERR_OR_NULL() check.
>
> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: stable@vger.kernel.org
> Cc: David Miller <davem@davemloft.net>
> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> ---
>
> 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 | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 864b476..7985d8a 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -837,7 +837,7 @@ 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);
Hm, in case of phydev == NULL, you're going to return 0 here... is that
what you want?
MBR, Sergei
next prev parent reply other threads:[~2015-09-07 20:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-07 20:50 [PATCH v2] stmmac: fix check for phydev being open Alexey Brodkin
2015-09-07 20:53 ` Sergei Shtylyov [this message]
2015-09-07 21:08 ` Alexey Brodkin
2015-09-07 21:24 ` Sergei Shtylyov
2015-09-07 21:26 ` Alexey Brodkin
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=55EDF930.10601@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=Alexey.Brodkin@synopsys.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=stable@vger.kernel.org \
/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.