Skip to contentSkip to conversation

stmmac: dwmac-loongson:add the return value

PATCH In review zhaoxiao 2 participants 2 messages Aug 30, 2021

Subsystems (4)
lore
Share & tools
lore

zhaoxiao

author
#0 lore raw

PATCH 1/1 stmmac: dwmac-loongson:add the return value

Add the return value when phy_mode < 0.

---
 drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -1
index 4c9a37dd0d3f..ecf759ee1c9f 100644
@@ -109,8 +109,10 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
 		plat->bus_id = pci_dev_id(pdev);
 
 	phy_mode = device_get_phy_mode(&pdev->dev);
-	if (phy_mode < 0)
+	if (phy_mode < 0) {
 		dev_err(&pdev->dev, "phy_mode not found\n");
+		return phy_mode;
+	}
 
 	plat->phy_interface = phy_mode;
 	plat->interface = PHY_INTERFACE_MODE_GMII;
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 13 lines · On Mon, 30 Aug 2021 13:29:13 +0800 zhaoxiao wrote:

Add the return value when phy_mode < 0.

---
 drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +0 -0
index 4c9a37dd0d3f..ecf759ee1c9f 100644
@@ -109,8 +109,10 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id
 		plat->bus_id = pci_dev_id(pdev);

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id · line 118

Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c +3 -1
 
 	phy_mode = device_get_phy_mode(&pdev->dev);
-	if (phy_mode < 0)
+	if (phy_mode < 0) {
 		dev_err(&pdev->dev, "phy_mode not found\n");
+		return phy_mode;
+	}
 
 	plat->phy_interface = phy_mode;
 	plat->interface = PHY_INTERFACE_MODE_GMII;

Qing Zhang, does the change look correct to you?

Is it better to assume GMII and continue like the code is currently doing?