aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-04 15:37:51 -0400
committerMark Brown <broonie@linaro.org>2013-09-16 19:51:05 -0400
commitd644a115e86433abbb544808c4be1e4b5a048c2b (patch)
tree52d4581b6121fb2fb418e26b85c0d6f3aab2afbd
parent9a8e0322f0a8c7506f4ced07ec2a7e7e2a9cbe4a (diff)
ASoC: samsung-i2s: Use devm_snd_soc_register_component()
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/samsung/i2s.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index a7e3519ad7c4..32956df8f50c 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1143,9 +1143,9 @@ static int samsung_i2s_probe(struct platform_device *pdev)
1143 dev_err(&pdev->dev, "Unable to get drvdata\n"); 1143 dev_err(&pdev->dev, "Unable to get drvdata\n");
1144 return -EFAULT; 1144 return -EFAULT;
1145 } 1145 }
1146 snd_soc_register_component(&sec_dai->pdev->dev, 1146 devm_snd_soc_register_component(&sec_dai->pdev->dev,
1147 &samsung_i2s_component, 1147 &samsung_i2s_component,
1148 &sec_dai->i2s_dai_drv, 1); 1148 &sec_dai->i2s_dai_drv, 1);
1149 samsung_asoc_dma_platform_register(&pdev->dev); 1149 samsung_asoc_dma_platform_register(&pdev->dev);
1150 return 0; 1150 return 0;
1151 } 1151 }
@@ -1258,8 +1258,9 @@ static int samsung_i2s_probe(struct platform_device *pdev)
1258 goto err; 1258 goto err;
1259 } 1259 }
1260 1260
1261 snd_soc_register_component(&pri_dai->pdev->dev, &samsung_i2s_component, 1261 devm_snd_soc_register_component(&pri_dai->pdev->dev,
1262 &pri_dai->i2s_dai_drv, 1); 1262 &samsung_i2s_component,
1263 &pri_dai->i2s_dai_drv, 1);
1263 1264
1264 pm_runtime_enable(&pdev->dev); 1265 pm_runtime_enable(&pdev->dev);
1265 1266
@@ -1294,7 +1295,6 @@ static int samsung_i2s_remove(struct platform_device *pdev)
1294 i2s->sec_dai = NULL; 1295 i2s->sec_dai = NULL;
1295 1296
1296 samsung_asoc_dma_platform_unregister(&pdev->dev); 1297 samsung_asoc_dma_platform_unregister(&pdev->dev);
1297 snd_soc_unregister_component(&pdev->dev);
1298 1298
1299 return 0; 1299 return 0;
1300} 1300}