ASoC: twl6040: Convert to use devm_* when possible

In this way we can clean up the probe and remove paths

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 86f12a498f388b771f8f4da7fa744debf47e0ee2..90b721e437a3a2e2b22758219b8a85d147f3304e 100644 (file)
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1131,9 +1131,10 @@ static int twl6040_probe(struct snd_soc_codec *codec)
                                                   struct platform_device, dev);
        int ret = 0;
 
-       priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);
+       priv = devm_kzalloc(codec->dev, sizeof(*priv), GFP_KERNEL);
        if (priv == NULL)
                return -ENOMEM;
+
        snd_soc_codec_set_drvdata(codec, priv);
 
        priv->codec = codec;
@@ -1158,25 +1159,23 @@ static int twl6040_probe(struct snd_soc_codec *codec)
        priv->plug_irq = platform_get_irq(pdev, 0);
        if (priv->plug_irq < 0) {
                dev_err(codec->dev, "invalid irq\n");
-               ret = -EINVAL;
-               goto work_err;
+               return -EINVAL;
        }
 
        priv->workqueue = alloc_workqueue("twl6040-codec", 0, 0);
-       if (!priv->workqueue) {
-               ret = -ENOMEM;
-               goto work_err;
-       }
+       if (!priv->workqueue)
+               return -ENOMEM;
 
        INIT_DELAYED_WORK(&priv->hs_jack.work, twl6040_accessory_work);
 
        mutex_init(&priv->mutex);
 
-       ret = request_threaded_irq(priv->plug_irq, NULL, twl6040_audio_handler,
-                                  IRQF_NO_SUSPEND, "twl6040_irq_plug", codec);
+       ret = devm_request_threaded_irq(codec->dev, priv->plug_irq, NULL,
+                                       twl6040_audio_handler, IRQF_NO_SUSPEND,
+                                       "twl6040_irq_plug", codec);
        if (ret) {
                dev_err(codec->dev, "PLUG IRQ request failed: %d\n", ret);
-               goto plugirq_err;
+               goto err;
        }
 
        twl6040_init_chip(codec);
@@ -1186,12 +1185,8 @@ static int twl6040_probe(struct snd_soc_codec *codec)
        if (!ret)
                return 0;
 
-       /* Error path */
-       free_irq(priv->plug_irq, codec);
-plugirq_err:
+err:
        destroy_workqueue(priv->workqueue);
-work_err:
-       kfree(priv);
        return ret;
 }
 
@@ -1200,9 +1195,7 @@ static int twl6040_remove(struct snd_soc_codec *codec)
        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
 
        twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF);
-       free_irq(priv->plug_irq, codec);
        destroy_workqueue(priv->workqueue);
-       kfree(priv);
 
        return 0;
 }