aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-08-23 17:14:45 -0400
committerMark Brown <broonie@linaro.org>2013-08-26 07:50:42 -0400
commit5af407cd365c8aab8a20e66aa6e4bc4a4983979e (patch)
tree670fadfa996a24f416a9006a4cee9143bcefc751 /sound
parentf037708654eef9c5477ac2a88b3a1e8b5d190dc4 (diff)
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')
-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)
1184 &spdif_priv->cpu_dai_drv, 1); 1184 &spdif_priv->cpu_dai_drv, 1);
1185 if (ret) { 1185 if (ret) {
1186 dev_err(&pdev->dev, "failed to register DAI: %d\n", ret); 1186 dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
1187 goto error_dev; 1187 return ret;
1188 } 1188 }
1189 1189
1190 ret = imx_pcm_dma_init(pdev); 1190 ret = imx_pcm_dma_init(pdev);
@@ -1197,8 +1197,6 @@ static int fsl_spdif_probe(struct platform_device *pdev)
1197 1197
1198error_component: 1198error_component:
1199 snd_soc_unregister_component(&pdev->dev); 1199 snd_soc_unregister_component(&pdev->dev);
1200error_dev:
1201 dev_set_drvdata(&pdev->dev, NULL);
1202 1200
1203 return ret; 1201 return ret;
1204} 1202}
@@ -1207,7 +1205,6 @@ static int fsl_spdif_remove(struct platform_device *pdev)
1207{ 1205{
1208 imx_pcm_dma_exit(pdev); 1206 imx_pcm_dma_exit(pdev);
1209 snd_soc_unregister_component(&pdev->dev); 1207 snd_soc_unregister_component(&pdev->dev);
1210 dev_set_drvdata(&pdev->dev, NULL);
1211 1208
1212 return 0; 1209 return 0;
1213} 1210}