summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-08-23 18:14:45 -0300
committerMark Brown <broonie@linaro.org>2013-08-26 12:50:42 +0100
commit5af407cd365c8aab8a20e66aa6e4bc4a4983979e (patch)
tree670fadfa996a24f416a9006a4cee9143bcefc751 /sound/soc
parentf037708654eef9c5477ac2a88b3a1e8b5d190dc4 (diff)
downloadblackbird-op-linux-5af407cd365c8aab8a20e66aa6e4bc4a4983979e.tar.gz
blackbird-op-linux-5af407cd365c8aab8a20e66aa6e4bc4a4983979e.zip
ASoC: fsl_spdif: Remove unnecessary dev_set_drvdata()
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/fsl/fsl_spdif.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 42a43820d993..a8ef46a3281b 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -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;
}
OpenPOWER on IntegriCloud