ASoC: meson: use dev_err_probe
Jerome Brunet
maintainerPATCH 1/1 ASoC: meson: use dev_err_probe
Use dev_err_probe() helper function to handle probe deferral. It removes the open coded test for -EPROBE_DEFER but more importantly, it sets the deferral reason in debugfs which is great for debugging.
--- sound/soc/meson/aiu.c | 17 +++++++---------- sound/soc/meson/axg-fifo.c | 9 +++------ sound/soc/meson/axg-pdm.c | 9 +++------ sound/soc/meson/axg-spdifin.c | 6 ++---- sound/soc/meson/axg-spdifout.c | 6 ++---- sound/soc/meson/axg-tdm-formatter.c | 18 ++++++------------ sound/soc/meson/axg-tdm-interface.c | 9 +++------ sound/soc/meson/meson-card-utils.c | 4 ++-- sound/soc/meson/t9015.c | 8 ++++---- 9 files changed, 32 insertions(+), 54 deletions(-)
sound/soc/meson/aiu.c +7 -10
@@ -219,31 +219,29 @@ static int aiu_clk_get(struct device *dev) aiu->pclk =devm_clk_get (dev,"pclk" );if (IS_ERR (aiu->pclk)) { -if (PTR_ERR (aiu->pclk) != -EPROBE_DEFER ) -dev_err (dev,"Can't get the aiu pclk\n" ); +dev_err_probe (dev,PTR_ERR (aiu->pclk), +"Can't get the aiu pclk\n" );return PTR_ERR (aiu->pclk); } aiu->spdif_mclk =devm_clk_get (dev,"spdif_mclk" );if (IS_ERR (aiu->spdif_mclk)) { -if (PTR_ERR (aiu->spdif_mclk) != -EPROBE_DEFER ) -dev_err (dev,"Can't get the aiu spdif master clock\n" ); +dev_err_probe (dev,PTR_ERR (aiu->spdif_mclk), +"Can't get the aiu spdif master clock\n" );return PTR_ERR (aiu->spdif_mclk); } ret =aiu_clk_bulk_get (dev, aiu_i2s_ids,ARRAY_SIZE (aiu_i2s_ids), &aiu->i2s);if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (dev,"Can't get the i2s clocks\n" ); +dev_err_probe (dev, ret,"Can't get the i2s clocks\n" );return ret; } ret =aiu_clk_bulk_get (dev, aiu_spdif_ids,ARRAY_SIZE (aiu_spdif_ids), &aiu->spdif);if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (dev,"Can't get the spdif clocks\n" ); +dev_err_probe (dev, ret,"Can't get the spdif clocks\n" );return ret; }
@@ -282,8 +280,7 @@ static int aiu_probe(struct platform_device *pdev) ret =device_reset (dev);if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (dev,"Failed to reset device\n" ); +dev_err_probe (dev, ret,"Failed to reset device\n" );return ret; }
sound/soc/meson/axg-fifo.c +3 -6
@@ -352,17 +352,14 @@ int axg_fifo_probe(struct platform_device *pdev) fifo->pclk =devm_clk_get (dev,NULL );if (IS_ERR (fifo->pclk)) { -if (PTR_ERR (fifo->pclk) != -EPROBE_DEFER ) -dev_err (dev,"failed to get pclk: %ld\n" , -PTR_ERR (fifo->pclk)); +dev_err_probe (dev,PTR_ERR (fifo->pclk),"failed to get pclk\n" );return PTR_ERR (fifo->pclk); } fifo->arb =devm_reset_control_get_exclusive (dev,NULL );if (IS_ERR (fifo->arb)) { -if (PTR_ERR (fifo->arb) != -EPROBE_DEFER ) -dev_err (dev,"failed to get arb reset: %ld\n" , -PTR_ERR (fifo->arb)); +dev_err_probe (dev,PTR_ERR (fifo->arb), +"failed to get arb reset\n" );return PTR_ERR (fifo->arb); }
sound/soc/meson/axg-pdm.c +3 -6
@@ -613,24 +613,21 @@ static int axg_pdm_probe(struct platform_device *pdev) priv->pclk =devm_clk_get (dev,"pclk" );if (IS_ERR (priv->pclk)) { ret =PTR_ERR (priv->pclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get pclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get pclk\n" );return ret; } priv->dclk =devm_clk_get (dev,"dclk" );if (IS_ERR (priv->dclk)) { ret =PTR_ERR (priv->dclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get dclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get dclk\n" );return ret; } priv->sysclk =devm_clk_get (dev,"sysclk" );if (IS_ERR (priv->sysclk)) { ret =PTR_ERR (priv->sysclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get dclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get dclk\n" );return ret; }
sound/soc/meson/axg-spdifin.c +2 -4
@@ -481,16 +481,14 @@ static int axg_spdifin_probe(struct platform_device *pdev) priv->pclk =devm_clk_get (dev,"pclk" );if (IS_ERR (priv->pclk)) { ret =PTR_ERR (priv->pclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get pclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get pclk\n" );return ret; } priv->refclk =devm_clk_get (dev,"refclk" );if (IS_ERR (priv->refclk)) { ret =PTR_ERR (priv->refclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get mclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get mclk\n" );return ret; }
sound/soc/meson/axg-spdifout.c +2 -4
@@ -424,16 +424,14 @@ static int axg_spdifout_probe(struct platform_device *pdev) priv->pclk =devm_clk_get (dev,"pclk" );if (IS_ERR (priv->pclk)) { ret =PTR_ERR (priv->pclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get pclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get pclk\n" );return ret; } priv->mclk =devm_clk_get (dev,"mclk" );if (IS_ERR (priv->mclk)) { ret =PTR_ERR (priv->mclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get mclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get mclk\n" );return ret; }
sound/soc/meson/axg-tdm-formatter.c +6 -12
@@ -284,8 +284,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) formatter->pclk =devm_clk_get (dev,"pclk" );if (IS_ERR (formatter->pclk)) { ret =PTR_ERR (formatter->pclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get pclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get pclk\n" );return ret; }
@@ -293,8 +292,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) formatter->sclk =devm_clk_get (dev,"sclk" );if (IS_ERR (formatter->sclk)) { ret =PTR_ERR (formatter->sclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get sclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get sclk\n" );return ret; }
@@ -302,8 +300,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) formatter->lrclk =devm_clk_get (dev,"lrclk" );if (IS_ERR (formatter->lrclk)) { ret =PTR_ERR (formatter->lrclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get lrclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get lrclk\n" );return ret; }
@@ -311,8 +308,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) formatter->sclk_sel =devm_clk_get (dev,"sclk_sel" );if (IS_ERR (formatter->sclk_sel)) { ret =PTR_ERR (formatter->sclk_sel); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get sclk_sel: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get sclk_sel\n" );return ret; }
@@ -320,8 +316,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) formatter->lrclk_sel =devm_clk_get (dev,"lrclk_sel" );if (IS_ERR (formatter->lrclk_sel)) { ret =PTR_ERR (formatter->lrclk_sel); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get lrclk_sel: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get lrclk_sel\n" );return ret; }
@@ -329,8 +324,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev) formatter->reset =devm_reset_control_get_optional_exclusive (dev,NULL );if (IS_ERR (formatter->reset)) { ret =PTR_ERR (formatter->reset); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get reset: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get reset\n" );return ret; }
sound/soc/meson/axg-tdm-interface.c +3 -6
@@ -535,8 +535,7 @@ static int axg_tdm_iface_probe(struct platform_device *pdev) iface->sclk =devm_clk_get (dev,"sclk" );if (IS_ERR (iface->sclk)) { ret =PTR_ERR (iface->sclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get sclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get sclk\n" );return ret; }
@@ -544,8 +543,7 @@ static int axg_tdm_iface_probe(struct platform_device *pdev) iface->lrclk =devm_clk_get (dev,"lrclk" );if (IS_ERR (iface->lrclk)) { ret =PTR_ERR (iface->lrclk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get lrclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get lrclk\n" );return ret; }
@@ -561,8 +559,7 @@ static int axg_tdm_iface_probe(struct platform_device *pdev)if (ret == -ENOENT ) { iface->mclk =NULL ; }else { -if (ret != -EPROBE_DEFER ) -dev_err (dev,"failed to get mclk: %d\n" , ret); +dev_err_probe (dev, ret,"failed to get mclk\n" );return ret; } }
sound/soc/meson/meson-card-utils.c +2 -2
@@ -86,8 +86,8 @@ int meson_card_parse_dai(struct snd_soc_card *card, ret =of_parse_phandle_with_args (node,"sound-dai" ,"#sound-dai-cells" ,0 , &args);if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (card->dev,"can't parse dai %d\n" , ret); +dev_err_probe (card->dev, ret, +"can't parse sound-dai at %pOFn\n" , node);return ret; } *dai_of_node = args.np;
sound/soc/meson/t9015.c +4 -4
@@ -259,15 +259,15 @@ static int t9015_probe(struct platform_device *pdev) priv->pclk =devm_clk_get (dev,"pclk" );if (IS_ERR (priv->pclk)) { -if (PTR_ERR (priv->pclk) != -EPROBE_DEFER ) -dev_err (dev,"failed to get core clock\n" ); +dev_err_probe (dev,PTR_ERR (priv->pclk), +"failed to get core clock\n" );return PTR_ERR (priv->pclk); } priv->avdd =devm_regulator_get (dev,"AVDD" );if (IS_ERR (priv->avdd)) { -if (PTR_ERR (priv->avdd) != -EPROBE_DEFER ) -dev_err (dev,"failed to AVDD\n" ); +dev_err_probe (dev,PTR_ERR (priv->avdd), +"failed to get AVDD\n" );return PTR_ERR (priv->avdd); }
Signature · 1 line
2.34.0
Quoted 23 lines · Jerome Brunet
Use
dev_err_probe()helper function to handle probe deferral. It removes the open coded test for -EPROBE_DEFER but more importantly, it sets the deferral reason in debugfs which is great for debugging.Signed-off-by Jerome Brunet <[email protected]>---
sound/soc/meson/aiu.c | 17 +++++++---------- sound/soc/meson/axg-fifo.c | 9 +++------ sound/soc/meson/axg-pdm.c | 9 +++------ sound/soc/meson/axg-spdifin.c | 6 ++---- sound/soc/meson/axg-spdifout.c | 6 ++----sound/soc/meson/axg-tdm-formatter.c| 18 ++++++------------sound/soc/meson/axg-tdm-interface.c| 9 +++------ sound/soc/meson/meson-card-utils.c | 4 ++-- sound/soc/meson/t9015.c | 8 ++++----9 files changed, 32 insertions(+), 54 deletions(-)sound/soc/meson/aiu.c +0
-0@@ -219,31 +219,29 @@ static int aiu_clk_get(struct device *dev)
Quoted 8 lines
aiu->pclk=devm_clk_get(dev, "pclk");
if (IS_ERR(aiu->pclk)) {
- if (PTR_ERR(aiu->pclk)!= -EPROBE_DEFER) -dev_err(dev, "Can't get the aiu pclk\n"); + dev_err_probe(dev,PTR_ERR(aiu->pclk), + "Can't get the aiu pclk\n"); returnPTR_ERR(aiu->pclk);
}
A minor thing, but dev_err_probe returns its err argument, so this construct can be written more tersely as:
return dev_err_probe(dev, PTR_ERR(aio->pclk),
"Can't get the aio pclk\n");and that also seems to be in common usage when browsing existing code.
/Ricard
Signature · 3 lines
Ricard Wolf Wanderlof ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30
Jerome Brunet
maintainerQuoted 37 lines · Ricard Wanderlof
Quoted 23 lines · Jerome Brunet
Use
dev_err_probe()helper function to handle probe deferral. It removes the open coded test for -EPROBE_DEFER but more importantly, it sets the deferral reason in debugfs which is great for debugging.Signed-off-by Jerome Brunet <[email protected]>---
sound/soc/meson/aiu.c | 17 +++++++---------- sound/soc/meson/axg-fifo.c | 9 +++------ sound/soc/meson/axg-pdm.c | 9 +++------ sound/soc/meson/axg-spdifin.c | 6 ++---- sound/soc/meson/axg-spdifout.c | 6 ++----sound/soc/meson/axg-tdm-formatter.c| 18 ++++++------------sound/soc/meson/axg-tdm-interface.c| 9 +++------ sound/soc/meson/meson-card-utils.c | 4 ++-- sound/soc/meson/t9015.c | 8 ++++----9 files changed, 32 insertions(+), 54 deletions(-)sound/soc/meson/aiu.c +0
-0@@ -219,31 +219,29 @@ static int aiu_clk_get(struct device *dev)Quoted 8 lines
aiu->pclk=devm_clk_get(dev, "pclk");
if (IS_ERR(aiu->pclk)) {
- if (PTR_ERR(aiu->pclk)!= -EPROBE_DEFER) -dev_err(dev, "Can't get the aiu pclk\n"); + dev_err_probe(dev,PTR_ERR(aiu->pclk), + "Can't get the aiu pclk\n"); returnPTR_ERR(aiu->pclk);
}A minor thing, but
dev_err_probereturns its err argument, so this construct can be written more tersely as:
Quoted 4 lines
return dev_err_probe(dev, PTR_ERR(aio->pclk), "Can't get the aio pclk\n");and that also seems to be in common usage when browsing existing code.
Missed that
Thanks Ricard, I'll update the change.
Quoted 2 lines
/Ricard