소스 검색

ASoC: qi_lb60: Use devm_snd_soc_register_card()

Makes the code a bit shorter and will also allow us to remove the drivers
remove() callback eventually.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Lars-Peter Clausen 11 년 전
부모
커밋
050f62e4de
1개의 변경된 파일1개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 4
      sound/soc/jz4740/qi_lb60.c

+ 1 - 4
sound/soc/jz4740/qi_lb60.c

@@ -86,7 +86,7 @@ static int qi_lb60_probe(struct platform_device *pdev)
 
 
 	card->dev = &pdev->dev;
 	card->dev = &pdev->dev;
 
 
-	ret = snd_soc_register_card(card);
+	ret = devm_snd_soc_register_card(&pdev->dev, card);
 	if (ret) {
 	if (ret) {
 		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
 		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
 			ret);
 			ret);
@@ -97,9 +97,6 @@ static int qi_lb60_probe(struct platform_device *pdev)
 
 
 static int qi_lb60_remove(struct platform_device *pdev)
 static int qi_lb60_remove(struct platform_device *pdev)
 {
 {
-	struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-	snd_soc_unregister_card(card);
 	gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
 	gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
 	return 0;
 	return 0;
 }
 }