From: Sean Wang <sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
To: <john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>,
<davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
nbd-p3rKhJxN3npAfugRpC6u6w@public.gmane.org,
Sean Wang <sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
keyhaede-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Subject: [RESEND PATCH net 02/10] net: ethernet: mediatek: fix incorrect return value of devm_clk_get with EPROBE_DEFER
Date: Thu, 25 Aug 2016 18:44:53 +0800 [thread overview]
Message-ID: <1472121901-15629-3-git-send-email-sean.wang@mediatek.com> (raw)
In-Reply-To: <1472121901-15629-1-git-send-email-sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
If the return value of devm_clk_get is EPROBE_DEFER, we should
defer probing the driver. The change is verified and works based
on 4.8-rc1 staying with the latest clk-next code for MT7623.
Signed-off-by: Sean Wang <sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 6e4a6ca..02b048f 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1851,8 +1851,15 @@ static int mtk_probe(struct platform_device *pdev)
eth->clk_gp1 = devm_clk_get(&pdev->dev, "gp1");
eth->clk_gp2 = devm_clk_get(&pdev->dev, "gp2");
if (IS_ERR(eth->clk_esw) || IS_ERR(eth->clk_gp1) ||
- IS_ERR(eth->clk_gp2) || IS_ERR(eth->clk_ethif))
- return -ENODEV;
+ IS_ERR(eth->clk_gp2) || IS_ERR(eth->clk_ethif)) {
+ if (PTR_ERR(eth->clk_esw) == -EPROBE_DEFER ||
+ PTR_ERR(eth->clk_gp1) == -EPROBE_DEFER ||
+ PTR_ERR(eth->clk_gp1) == -EPROBE_DEFER ||
+ PTR_ERR(eth->clk_gp2) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ else
+ return -ENODEV;
+ }
clk_prepare_enable(eth->clk_ethif);
clk_prepare_enable(eth->clk_esw);
--
1.9.1
next prev parent reply other threads:[~2016-08-25 10:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-25 10:44 [RESEND PATCH net 00/10] net: ethernet: mediatek: a couple of fixes Sean Wang
2016-08-25 10:44 ` [RESEND PATCH net 01/10] net: ethernet: mediatek: fix fails from TX housekeeping due to incorrect port setup Sean Wang
2016-08-25 12:19 ` John Crispin
[not found] ` <1472121901-15629-1-git-send-email-sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2016-08-25 10:44 ` Sean Wang [this message]
2016-08-25 13:49 ` [RESEND PATCH net 02/10] net: ethernet: mediatek: fix incorrect return value of devm_clk_get with EPROBE_DEFER John Crispin
[not found] ` <e1e9ca7a-c33b-3a9e-fd47-48f80bb10a32-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
2016-08-26 5:22 ` [RESEND PATCH net 02/10] net: ethernet: mediatek: fix incorrect Sean Wang
2016-08-25 10:44 ` [RESEND PATCH net 03/10] net: ethernet: mediatek: fix API usage with skb_free_frag Sean Wang
2016-08-25 12:20 ` John Crispin
2016-08-25 10:44 ` [RESEND PATCH net 04/10] net: ethernet: mediatek: remove redundant free_irq for devm_request_irq allocated irq Sean Wang
2016-08-25 12:20 ` John Crispin
2016-08-25 10:44 ` [RESEND PATCH net 05/10] net: ethernet: mediatek: fix logic unbalance between probe and remove Sean Wang
2016-08-25 12:22 ` John Crispin
2016-08-25 10:44 ` [RESEND PATCH net 06/10] net: ethernet: mediatek: fix the loss of pin-mux setting for GMAC2 Sean Wang
2016-08-25 13:30 ` Andrew Lunn
[not found] ` <20160825133034.GA25046-g2DYL2Zd6BY@public.gmane.org>
2016-08-26 3:33 ` [RESEND PATCH net 06/10] net: ethernet: mediatek: fix the loss Sean Wang
2016-08-26 14:17 ` Andrew Lunn
2016-08-29 4:27 ` Sean Wang
2016-08-25 10:44 ` [RESEND PATCH net 07/10] net: ethernet: mediatek: fix issue of driver removal with interface is up Sean Wang
[not found] ` <1472121901-15629-8-git-send-email-sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2016-08-25 13:35 ` John Crispin
[not found] ` <2203871f-d73d-3a39-928d-39862ba5e367-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
2016-08-26 5:50 ` Sean Wang
2016-08-25 10:44 ` [RESEND PATCH net 08/10] net: ethernet: mediatek: fix the missing of_node_put() after node is used done inside mtk_mdio_init Sean Wang
[not found] ` <1472121901-15629-9-git-send-email-sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2016-08-25 13:36 ` John Crispin
2016-08-25 10:45 ` [RESEND PATCH net 09/10] net: ethernet: mediatek: use devm_mdiobus_alloc instead of mdiobus_alloc " Sean Wang
[not found] ` <1472121901-15629-10-git-send-email-sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2016-08-25 13:39 ` John Crispin
2016-08-26 6:33 ` sean.wang
2016-08-25 10:45 ` [RESEND PATCH net 10/10] net: ethernet: mediatek: fix error handling " Sean Wang
[not found] ` <1472121901-15629-11-git-send-email-sean.wang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2016-08-25 13:39 ` John Crispin
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=1472121901-15629-3-git-send-email-sean.wang@mediatek.com \
--to=sean.wang-nus5lvnupcjwk0htik3j/w@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org \
--cc=keyhaede-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=nbd-p3rKhJxN3npAfugRpC6u6w@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).