* [PATCH] dpaa2-eth: fix an always true condition in dpaa2_mac_get_if_mode
@ 2019-11-06 17:06 Ioana Ciornei
2019-11-07 5:30 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ioana Ciornei @ 2019-11-06 17:06 UTC (permalink / raw
To: davem, netdev; +Cc: andrew, dan.carpenter, Ioana Ciornei
Convert the phy_mode() function to return the if_mode through an
argument, similar to the new form of of_get_phy_mode().
This will help with handling errors in a common manner and also will fix
an always true condition.
Fixes: 0c65b2b90d13 ("net: of_get_phy_mode: Change API to solve int/unit warnings")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
index b713739f4804..d322123ed373 100644
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c
@@ -7,14 +7,19 @@
#define phylink_to_dpaa2_mac(config) \
container_of((config), struct dpaa2_mac, phylink_config)
-static phy_interface_t phy_mode(enum dpmac_eth_if eth_if)
+static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)
{
+ *if_mode = PHY_INTERFACE_MODE_NA;
+
switch (eth_if) {
case DPMAC_ETH_IF_RGMII:
- return PHY_INTERFACE_MODE_RGMII;
+ *if_mode = PHY_INTERFACE_MODE_RGMII;
+ break;
default:
return -EINVAL;
}
+
+ return 0;
}
/* Caller must call of_node_put on the returned value */
@@ -51,11 +56,11 @@ static int dpaa2_mac_get_if_mode(struct device_node *node,
if (!err)
return if_mode;
- if_mode = phy_mode(attr.eth_if);
- if (if_mode >= 0)
+ err = phy_mode(attr.eth_if, &if_mode);
+ if (!err)
return if_mode;
- return -ENODEV;
+ return err;
}
static bool dpaa2_mac_phy_mode_mismatch(struct dpaa2_mac *mac,
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] dpaa2-eth: fix an always true condition in dpaa2_mac_get_if_mode
2019-11-06 17:06 [PATCH] dpaa2-eth: fix an always true condition in dpaa2_mac_get_if_mode Ioana Ciornei
@ 2019-11-07 5:30 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-11-07 5:30 UTC (permalink / raw
To: ioana.ciornei; +Cc: netdev, andrew, dan.carpenter
From: Ioana Ciornei <ioana.ciornei@nxp.com>
Date: Wed, 6 Nov 2019 19:06:50 +0200
> Convert the phy_mode() function to return the if_mode through an
> argument, similar to the new form of of_get_phy_mode().
> This will help with handling errors in a common manner and also will fix
> an always true condition.
>
> Fixes: 0c65b2b90d13 ("net: of_get_phy_mode: Change API to solve int/unit warnings")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Applied to net-next, thanks.
Please specify the appropriate target GIT tree when posting patches by listing
it in the Subject line, f.e.
Subject: [PATCH net-next] ...
Thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-07 5:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-06 17:06 [PATCH] dpaa2-eth: fix an always true condition in dpaa2_mac_get_if_mode Ioana Ciornei
2019-11-07 5:30 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.