Skip to contentSkip to conversation

mediatek: checking for IS_ERR() instead of NULL

PATCH Applied Dan Carpenter 3 participants 3 messages Mar 15, 2016 – Mar 18, 2016

Subsystems (5)
Networking Network drivers Kernel janitors Arm MediaTek +1 more subsystems
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/2 mediatek: checking for IS_ERR() instead of NULL

of_phy_connect() returns NULL on error, it never returns error pointers.

Fixes 656e705243fd ('net-next: mediatek: add support for MT7623 ethernet')
Signed-off-by Dan Carpenter <[email protected]>
drivers/net/ethernet/mediatek/mtk_eth_soc.c +2 -2
index ba3afa5..9759fe5 100644
@@ -186,9 +186,9 @@ static int mtk_phy_connect_node(struct mtk_eth *eth, struct mtk_mac *mac,
 
 	phydev = of_phy_connect(eth->netdev[mac->id], phy_node,
 				mtk_phy_link_adjust, 0, phy_mode);
-	if (IS_ERR(phydev)) {
+	if (!phydev) {
 		dev_err(eth->dev, "could not connect to PHY\n");
-		return PTR_ERR(phydev);
+		return -ENODEV;
 	}
 
 	dev_info(eth->dev,
Acked-by on v1 1/2
#1 lore raw
Quoted 5 lines · Dan Carpenter

of_phy_connect() returns NULL on error, it never returns error pointers.

Fixes 656e705243fd ('net-next: mediatek: add support for MT7623 ethernet')
Signed-off-by Dan Carpenter <[email protected]>
Acked-by John Crispin <[email protected]>

Thanks !

Quoted 22 lines
drivers/net/ethernet/mediatek/mtk_eth_soc.c +2 -2
index ba3afa5..9759fe5 100644
@@ -186,9 +186,9 @@ static int mtk_phy_connect_node(struct mtk_eth *eth, struct mtk_mac *mac,
 
 	phydev = of_phy_connect(eth->netdev[mac->id], phy_node,
 				mtk_phy_link_adjust, 0, phy_mode);
-	if (IS_ERR(phydev)) {
+	if (!phydev) {
 		dev_err(eth->dev, "could not connect to PHY\n");
-		return PTR_ERR(phydev);
+		return -ENODEV;
 	}
 
 	dev_info(eth->dev,

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek