]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: fsl_spdif: Remove unnecessary dev_set_drvdata()
authorFabio Estevam <fabio.estevam@freescale.com>
Fri, 23 Aug 2013 21:14:45 +0000 (18:14 -0300)
committerMark Brown <broonie@linaro.org>
Mon, 26 Aug 2013 11:50:42 +0000 (12:50 +0100)
Driver core clears the driver data to NULL after device_release or on probe
failure, so just remove it from here.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Nicolin Chen <b42378@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/fsl/fsl_spdif.c

index 42a43820d99373b87acf5397b1330ab5dd03878a..a8ef46a3281b8f10b5ffe5150516a7439935290a 100644 (file)
@@ -1184,7 +1184,7 @@ static int fsl_spdif_probe(struct platform_device *pdev)
                                         &spdif_priv->cpu_dai_drv, 1);
        if (ret) {
                dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
-               goto error_dev;
+               return ret;
        }
 
        ret = imx_pcm_dma_init(pdev);
@@ -1197,8 +1197,6 @@ static int fsl_spdif_probe(struct platform_device *pdev)
 
 error_component:
        snd_soc_unregister_component(&pdev->dev);
-error_dev:
-       dev_set_drvdata(&pdev->dev, NULL);
 
        return ret;
 }
@@ -1207,7 +1205,6 @@ static int fsl_spdif_remove(struct platform_device *pdev)
 {
        imx_pcm_dma_exit(pdev);
        snd_soc_unregister_component(&pdev->dev);
-       dev_set_drvdata(&pdev->dev, NULL);
 
        return 0;
 }