diff options
author | Andrew Jackson <Andrew.Jackson@arm.com> | 2014-12-30 05:55:46 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-30 11:49:37 -0500 |
commit | 758c2debcbf1a4ba6a787d276ca0fb3333105b06 (patch) | |
tree | 4114a0692bc079a120d0207089574a6fc6c04d95 | |
parent | 3a19272a507cd5ad214e0082c3ff7355dfe71329 (diff) |
ASoC: dwc: Register components with managed interface
Register SOC component using managed interface to
simplify error handling and future introduction of
device tree.
Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/dwc/designware_i2s.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index a6327cc086c0..1b9b18b79047 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c | |||
@@ -481,7 +481,7 @@ static int dw_i2s_probe(struct platform_device *pdev) | |||
481 | return ret; | 481 | return ret; |
482 | 482 | ||
483 | dev_set_drvdata(&pdev->dev, dev); | 483 | dev_set_drvdata(&pdev->dev, dev); |
484 | ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component, | 484 | ret = devm_snd_soc_register_component(&pdev->dev, &dw_i2s_component, |
485 | dw_i2s_dai, 1); | 485 | dw_i2s_dai, 1); |
486 | if (ret != 0) { | 486 | if (ret != 0) { |
487 | dev_err(&pdev->dev, "not able to register dai\n"); | 487 | dev_err(&pdev->dev, "not able to register dai\n"); |
@@ -499,7 +499,6 @@ static int dw_i2s_remove(struct platform_device *pdev) | |||
499 | { | 499 | { |
500 | struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); | 500 | struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); |
501 | 501 | ||
502 | snd_soc_unregister_component(&pdev->dev); | ||
503 | clk_disable_unprepare(dev->clk); | 502 | clk_disable_unprepare(dev->clk); |
504 | 503 | ||
505 | return 0; | 504 | return 0; |