net: bgmac: Return PTR_ERR() for fixed_phy_register()

Ruan Jinjie · davem330 · commit d6499f0b7c7c · 2023-08-20T15:13:27.000+01:00
fixed_phy_register() returns -EPROBE_DEFER, -EINVAL and -EBUSY,
etc, in addition to -ENODEV. The best practice is to return
these error codes with PTR_ERR().

Signed-off-by: Ruan Jinjie &lt;ruanjinjie@huawei.com&gt;
Reviewed-by: Andrew Lunn &lt;andrew@lunn.ch&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1450,7 +1450,7 @@ int bgmac_phy_connect_direct(struct bgmac *bgmac)
 	phy_dev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);
 	if (!phy_dev || IS_ERR(phy_dev)) {
 		dev_err(bgmac->dev, "Failed to register fixed PHY device\n");
-		return -ENODEV;
+		return PTR_ERR(phy_dev);
 	}
 
 	err = phy_connect_direct(bgmac->net_dev, phy_dev, bgmac_adjust_link,

Original file line number	Diff line number	Diff line change
`@@ -1450,7 +1450,7 @@ int bgmac_phy_connect_direct(struct bgmac *bgmac)`
`1450`	`1450`	`phy_dev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);`
`1451`	`1451`	`if (!phy_dev \|\| IS_ERR(phy_dev)) {`
`1452`	`1452`	`dev_err(bgmac->dev, "Failed to register fixed PHY device\n");`
`1453`		`- return -ENODEV;`
	`1453`	`+ return PTR_ERR(phy_dev);`
`1454`	`1454`	`}`
`1455`	`1455`
`1456`	`1456`	`err = phy_connect_direct(bgmac->net_dev, phy_dev, bgmac_adjust_link,`