2019-11-15 10:17:06

by Horatiu Vultur

Subject: [PATCH v2 net-next] net: mscc: ocelot: omit error check from of_get_phy_mode

The commit 0c65b2b90d13c ("net: of_get_phy_mode: Change API to solve
int/unit warnings") updated the function of_get_phy_mode declaration.
Now it returns an error code and in case the node doesn't contain the
property 'phy-mode' or 'phy-connection-type' it returns -EINVAL and would
set the phy_interface_t to PHY_INTERFACE_MODE_NA.

Ocelot VSC7514 has 4 internal phys which have the phy interface
PHY_INTERFACE_MODE_NA. So because of_get_phy_mode would assign
PHY_INTERFACE_MODE_NA to phy_mode when there is an error, there is no need
to add the error check.

Updates for v2:
- drop error check because of_get_phy_mode already assigns phy_interface
to PHY_INTERFACE_MODE in case of error.

Signed-off-by: Horatiu Vultur <[email protected]>
---
drivers/net/ethernet/mscc/ocelot_board.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_board.c b/drivers/net/ethernet/mscc/ocelot_board.c
index 811599f32910..7fe25cadc171 100644
--- a/drivers/net/ethernet/mscc/ocelot_board.c
+++ b/drivers/net/ethernet/mscc/ocelot_board.c
@@ -410,9 +410,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
priv = container_of(ocelot_port, struct ocelot_port_private,
port);

- err = of_get_phy_mode(portnp, &phy_mode);
- if (err && err != -ENODEV)
- goto out_put_ports;
+ of_get_phy_mode(portnp, &phy_mode);

priv->phy_mode = phy_mode;

--
2.17.1

2019-11-16 21:05:57

by David Miller

Subject: Re: [PATCH v2 net-next] net: mscc: ocelot: omit error check from of_get_phy_mode

From: Horatiu Vultur <[email protected]>
Date: Fri, 15 Nov 2019 11:11:15 +0100

> The commit 0c65b2b90d13c ("net: of_get_phy_mode: Change API to solve
> int/unit warnings") updated the function of_get_phy_mode declaration.
> Now it returns an error code and in case the node doesn't contain the
> property 'phy-mode' or 'phy-connection-type' it returns -EINVAL and would
> set the phy_interface_t to PHY_INTERFACE_MODE_NA.
>
> Ocelot VSC7514 has 4 internal phys which have the phy interface
> PHY_INTERFACE_MODE_NA. So because of_get_phy_mode would assign
> PHY_INTERFACE_MODE_NA to phy_mode when there is an error, there is no need
> to add the error check.
>
> Updates for v2:
> - drop error check because of_get_phy_mode already assigns phy_interface
> to PHY_INTERFACE_MODE in case of error.
>
> Signed-off-by: Horatiu Vultur <[email protected]>

Applied, thank you.