From: Claudiu Manoil <claudiu.manoil@nxp.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: alexandru.marginean@nxp.com, netdev@vger.kernel.org
Subject: [PATCH net-next 1/5] enetc: Fix if_mode extraction
Date: Fri, 6 Sep 2019 17:15:40 +0300 [thread overview]
Message-ID: <1567779344-30965-2-git-send-email-claudiu.manoil@nxp.com> (raw)
In-Reply-To: <1567779344-30965-1-git-send-email-claudiu.manoil@nxp.com>
Fix handling of error return code. Before this fix,
the error code was handled as unsigned type.
Also, on this path if if_mode not found then just handle
it as fixed link (i.e mac2mac connection).
Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com>
---
drivers/net/ethernet/freescale/enetc/enetc_pf.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index 7d6513ff8507..3a556646a2fb 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -751,6 +751,7 @@ static int enetc_of_get_phy(struct enetc_ndev_priv *priv)
struct enetc_pf *pf = enetc_si_priv(priv->si);
struct device_node *np = priv->dev->of_node;
struct device_node *mdio_np;
+ int phy_mode;
int err;
if (!np) {
@@ -784,17 +785,11 @@ static int enetc_of_get_phy(struct enetc_ndev_priv *priv)
}
}
- priv->if_mode = of_get_phy_mode(np);
- if (priv->if_mode < 0) {
- dev_err(priv->dev, "missing phy type\n");
- of_node_put(priv->phy_node);
- if (of_phy_is_fixed_link(np))
- of_phy_deregister_fixed_link(np);
- else
- enetc_mdio_remove(pf);
-
- return -EINVAL;
- }
+ phy_mode = of_get_phy_mode(np);
+ if (phy_mode < 0)
+ priv->if_mode = PHY_INTERFACE_MODE_NA; /* fixed link */
+ else
+ priv->if_mode = phy_mode;
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2019-09-06 14:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-06 14:15 [PATCH net-next 0/5] enetc: Link mode init w/o bootloader Claudiu Manoil
2019-09-06 14:15 ` Claudiu Manoil [this message]
2019-09-06 19:57 ` [PATCH net-next 1/5] enetc: Fix if_mode extraction Andrew Lunn
2019-09-09 16:24 ` Claudiu Manoil
2019-09-10 7:44 ` Andrew Lunn
2019-09-11 16:01 ` Claudiu Manoil
2019-09-06 14:15 ` [PATCH net-next 2/5] enetc: Make mdio accessors more generic Claudiu Manoil
2019-09-06 19:53 ` Andrew Lunn
2019-09-06 14:15 ` [PATCH net-next 3/5] enetc: Initialize SerDes for SGMII and SXGMII protocols Claudiu Manoil
2019-09-06 20:01 ` Andrew Lunn
2019-09-06 14:15 ` [PATCH net-next 4/5] enetc: Drop redundant device node check Claudiu Manoil
2019-09-06 14:15 ` [PATCH net-next 5/5] enetc: Use DT protocol information to set up the ports Claudiu Manoil
2019-09-06 20:06 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1567779344-30965-2-git-send-email-claudiu.manoil@nxp.com \
--to=claudiu.manoil@nxp.com \
--cc=alexandru.marginean@nxp.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).