Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1220399 > unrolled thread

[PATCH v2] stmmac: fix check for phydev being open

Back to article view | Back to linux.kernel

Contents

  [PATCH v2] stmmac: fix check for phydev being open Alexey Brodkin <Alexey.Brodkin@synopsys.com> - 2015-09-07 23:00 +0200
    Re: [PATCH v2] stmmac: fix check for phydev being open Alexey Brodkin <Alexey.Brodkin@synopsys.com> - 2015-09-07 23:30 +0200
    Re: [PATCH v2] stmmac: fix check for phydev being open Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-09-07 23:30 +0200

#1220399 — [PATCH v2] stmmac: fix check for phydev being open

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);
 	}
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1220407

Hi Sergei,

On Tue, 2015-09-08 at 00:24 +-0300, Sergei Shtylyov wrote:
+AD4- On 09/07/2015 11:50 PM, Alexey Brodkin wrote:
+AD4- 
+AD4- +AD4- Current implementation via IS+AF8-ERR(phydev) may make no sense because
+AD4- +AD4- of+AF8-phy+AF8-attach() returns NULL on failure instead of error value.
+AD4- 
+AD4-     Not of+AF8-phy+AF8-connect()?

I already noticed this misspelling - it came from my exploration of
what happens inside of+AF8-phy+AF8-connect(). So sort of braindump.

I will fix in v3 re-spin.

-Alexey--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1220408

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.

    Not of_phy_connect()?

> 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>

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web