| Message ID | 1472121901-15629-3-git-send-email-sean.wang@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 25/08/2016 12:44, Sean Wang wrote: > 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@mediatek.com> > --- > 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; > + } Hi Sean, this looks a bit tedious. maybe a better solution would be to add an array to struct mtk_eth for the clocks and an enum for the index mapping. that would allow the usage of loops to work out if all clocks are fine. the following code calling clk_prepare_enable() could then also be turned into a loop John > > clk_prepare_enable(eth->clk_ethif); > clk_prepare_enable(eth->clk_esw); >
On Date: Thu, 25 Aug 2016 15:49:10 +0200, John Crispin wrote: >On 25/08/2016 12:44, Sean Wang wrote: >> 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@mediatek.com> >> --- >> drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +++++++++-- >> 1 file changed, 9 insertions(+), 2 deletions(-) ... >> + PTR_ERR(eth->clk_gp2) == -EPROBE_DEFER) >> + return -EPROBE_DEFER; >> + else >> + return -ENODEV; >> + } > >Hi Sean, > >this looks a bit tedious. maybe a better solution would be to add an >array to struct mtk_eth for the clocks and an enum for the index >mapping. that would allow the usage of loops to work out if all clocks >are fine. the following code calling clk_prepare_enable() could then >also be turned into a loop > > John The suggestion is better, so I will use your suggested way to to implement the logic in the next version. > >> >> clk_prepare_enable(eth->clk_ethif); >> clk_prepare_enable(eth->clk_esw); >>
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);
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@mediatek.com> --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)