The function kirkwood_i2s_dev_remove() may be used when probe fails.
Signed-off-by: Jean-Francois Moine <[email protected]>
---
sound/soc/kirkwood/kirkwood-i2s.c | 44 +++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 4c9dad3..d3e50af 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -455,6 +455,21 @@ static const struct snd_soc_component_driver kirkwood_i2s_component = {
.name = DRV_NAME,
};
+static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
+{
+ struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev);
+
+ snd_soc_unregister_component(&pdev->dev);
+
+ if (!IS_ERR(priv->extclk)) {
+ clk_disable_unprepare(priv->extclk);
+ clk_put(priv->extclk);
+ }
+ clk_disable_unprepare(priv->clk);
+
+ return 0;
+}
+
static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
{
struct kirkwood_asoc_platform_data *data = pdev->dev.platform_data;
@@ -525,34 +540,17 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
err = snd_soc_register_component(&pdev->dev, &kirkwood_i2s_component,
soc_dai, 1);
- if (!err)
- return 0;
- dev_err(&pdev->dev, "snd_soc_register_component failed\n");
-
- if (!IS_ERR(priv->extclk)) {
- clk_disable_unprepare(priv->extclk);
- clk_put(priv->extclk);
+ if (err) {
+ dev_err(&pdev->dev, "snd_soc_register_component failed\n");
+ goto fail;
}
- clk_disable_unprepare(priv->clk);
+ return 0;
+fail:
+ kirkwood_i2s_dev_remove(pdev);
return err;
}
-static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
-{
- struct kirkwood_dma_data *priv = dev_get_drvdata(&pdev->dev);
-
- snd_soc_unregister_component(&pdev->dev);
-
- if (!IS_ERR(priv->extclk)) {
- clk_disable_unprepare(priv->extclk);
- clk_put(priv->extclk);
- }
- clk_disable_unprepare(priv->clk);
-
- return 0;
-}
-
static struct platform_driver kirkwood_i2s_driver = {
.probe = kirkwood_i2s_dev_probe,
.remove = kirkwood_i2s_dev_remove,
--
1.8.3.2
--
Ken ar c'hentañ | ** Breizh ha Linux atav! **
Jef | http://moinejf.free.fr/
On Thu, Jul 25, 2013 at 11:13:57AM +0200, Jean-Francois Moine wrote:
> The function kirkwood_i2s_dev_remove() may be used when probe fails.
This seems fine but doesn't apply against current code but otherwise
seems fine.
> + if (!IS_ERR(priv->extclk)) {
> + clk_disable_unprepare(priv->extclk);
> + clk_put(priv->extclk);
> + }
Could use devm_clk_get() for extclk.
On Thu, 25 Jul 2013 20:10:59 +0100
Mark Brown <[email protected]> wrote:
> On Thu, Jul 25, 2013 at 11:13:57AM +0200, Jean-Francois Moine wrote:
> > The function kirkwood_i2s_dev_remove() may be used when probe fails.
>
> This seems fine but doesn't apply against current code but otherwise
> seems fine.
My base is 3.11-rc2.
> > + if (!IS_ERR(priv->extclk)) {
> > + clk_disable_unprepare(priv->extclk);
> > + clk_put(priv->extclk);
> > + }
>
> Could use devm_clk_get() for extclk.
I will do it.
--
Ken ar c'hentañ | ** Breizh ha Linux atav! **
Jef | http://moinejf.free.fr/
On Fri, Jul 26, 2013 at 08:28:18AM +0200, Jean-Francois Moine wrote:
> Mark Brown <[email protected]> wrote:
> > This seems fine but doesn't apply against current code but otherwise
> > seems fine.
> My base is 3.11-rc2.
Always submit against where the code will be applied - -next in this
case.