From: Niklas Cassel <niklas.cassel@axis.com>
To: Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Alexandre Torgue <alexandre.torgue@st.com>
Cc: Jose.Abreu@synopsys.com, vbhadram@nvidia.com,
Niklas Cassel <niklass@axis.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next 7/7] net: stmmac: honor error code from stmmac_dt_phy()
Date: Mon, 19 Feb 2018 18:11:15 +0100 [thread overview]
Message-ID: <20180219171116.15326-8-niklas.cassel@axis.com> (raw)
In-Reply-To: <20180219171116.15326-1-niklas.cassel@axis.com>
Honor error code from stmmac_dt_phy() instead of always
returning -ENODEV.
No functional change intended.
Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index bcfac84cf6fb..ebd3e5ffa73c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -417,8 +417,9 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
dev_warn(&pdev->dev, "snps,phy-addr property is deprecated\n");
/* To Configure PHY by using all device-tree supported properties */
- if (stmmac_dt_phy(plat, np, &pdev->dev))
- return ERR_PTR(-ENODEV);
+ rc = stmmac_dt_phy(plat, np, &pdev->dev);
+ if (rc)
+ return ERR_PTR(rc);
of_property_read_u32(np, "tx-fifo-depth", &plat->tx_fifo_size);
--
2.14.2
next prev parent reply other threads:[~2018-02-19 17:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-19 17:11 [PATCH net-next 0/7] stmmac multi-queue fixes and cleanups Niklas Cassel
2018-02-19 17:11 ` [PATCH net-next 1/7] net: stmmac: set MSS for each tx DMA channel Niklas Cassel
2018-02-20 7:31 ` Giuseppe CAVALLARO
2018-02-19 17:11 ` [PATCH net-next 2/7] net: stmmac: do not clear tx_skbuff entries in stmmac_xmit()/stmmac_tso_xmit() Niklas Cassel
2018-02-19 17:11 ` [PATCH net-next 3/7] net: stmmac: WARN if tx_skbuff entries are reused before cleared Niklas Cassel
2018-02-19 17:11 ` [PATCH net-next 4/7] net: stmmac: rename dwmac4_tx_queue_routing() to match reality Niklas Cassel
2018-02-19 17:11 ` [PATCH net-next 5/7] net: stmmac: call correct function in stmmac_mac_config_rx_queues_routing() Niklas Cassel
2018-02-19 17:11 ` [PATCH net-next 6/7] net: stmmac: add error handling in stmmac_mtl_setup() Niklas Cassel
2018-02-19 17:11 ` Niklas Cassel [this message]
2018-02-19 18:12 ` [PATCH net-next 0/7] stmmac multi-queue fixes and cleanups Jose Abreu
2018-02-20 19:14 ` David Miller
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=20180219171116.15326-8-niklas.cassel@axis.com \
--to=niklas.cassel@axis.com \
--cc=Jose.Abreu@synopsys.com \
--cc=alexandre.torgue@st.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=niklass@axis.com \
--cc=peppe.cavallaro@st.com \
--cc=vbhadram@nvidia.com \
/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
all inboxes | Powered by JetHome®