2021-08-30 05:31:55

by zhaoxiao

Subject: [PATCH] stmmac: dwmac-loongson:add the return value

Add the return value when phy_mode < 0.

Signed-off-by: zhaoxiao <[email protected]>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
index 4c9a37dd0d3f..ecf759ee1c9f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
@@ -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;
--
2.20.1

2021-08-30 18:31:23

by Jakub Kicinski

Subject: Re: [PATCH] stmmac: dwmac-loongson:add the return value

On Mon, 30 Aug 2021 13:29:13 +0800 zhaoxiao wrote:
> Add the return value when phy_mode < 0.
>
> Signed-off-by: zhaoxiao <[email protected]>
> ---
> drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> index 4c9a37dd0d3f..ecf759ee1c9f 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c
> @@ -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;

Qing Zhang, does the change look correct to you?

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