ASoC: pxa: Convert to devm_snd_soc_register_card
Subsystems (3)
PATCH 1/1 ASoC: pxa: Convert to devm_snd_soc_register_card
Signed-off-by Axel Lin <[email protected]>
---
Only compile tested.
sound/soc/pxa/brownstone.c | 9 +-------- sound/soc/pxa/corgi.c | 11 +---------- sound/soc/pxa/e740_wm9705.c | 5 +---- sound/soc/pxa/e750_wm9705.c | 5 +---- sound/soc/pxa/e800_wm9712.c | 5 +---- sound/soc/pxa/hx4700.c | 4 +--- sound/soc/pxa/imote2.c | 11 +---------- sound/soc/pxa/mioa701_wm9713.c | 11 +---------- sound/soc/pxa/palm27x.c | 9 +-------- sound/soc/pxa/poodle.c | 11 +---------- sound/soc/pxa/spitz.c | 5 +---- sound/soc/pxa/tosa.c | 5 +---- sound/soc/pxa/ttc-dkb.c | 12 +----------- 13 files changed, 13 insertions(+), 90 deletions(-)
sound/soc/pxa/brownstone.c +1 -8
@@ -116,26 +116,19 @@ static int brownstone_probe(struct platform_device *pdev)int ret; brownstone.dev = &pdev->dev; - ret =snd_soc_register_card (&brownstone); + ret =devm_snd_soc_register_card (&pdev->dev, &brownstone);if (ret)dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);return ret; } -static int brownstone_remove (struct platform_device *pdev) -{ -snd_soc_unregister_card (&brownstone); -return 0 ; -} -static struct platform_driver mmp_driver = { .driver = { .name ="brownstone-audio" , .pm = &snd_soc_pm_ops, }, .probe = brownstone_probe, - .remove = brownstone_remove, };module_platform_driver (mmp_driver);
sound/soc/pxa/corgi.c +1 -10
@@ -295,28 +295,19 @@ static int corgi_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret)dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);return ret; } -static int corgi_remove (struct platform_device *pdev) -{ -struct snd_soc_card *card =platform_get_drvdata (pdev); - -snd_soc_unregister_card (card); -return 0 ; -} -static struct platform_driver corgi_driver = { .driver = { .name ="corgi-audio" , .pm = &snd_soc_pm_ops, }, .probe = corgi_probe, - .remove = corgi_remove, };module_platform_driver (corgi_driver);
sound/soc/pxa/e740_wm9705.c +1 -4
@@ -138,7 +138,7 @@ static int e740_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);
@@ -149,10 +149,7 @@ static int e740_probe(struct platform_device *pdev)static int e740_remove (struct platform_device *pdev) { -struct snd_soc_card *card =platform_get_drvdata (pdev); -gpio_free_array (e740_audio_gpios,ARRAY_SIZE (e740_audio_gpios)); -snd_soc_unregister_card (card);return 0 ; }
sound/soc/pxa/e750_wm9705.c +1 -4
@@ -120,7 +120,7 @@ static int e750_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);
@@ -131,10 +131,7 @@ static int e750_probe(struct platform_device *pdev)static int e750_remove (struct platform_device *pdev) { -struct snd_soc_card *card =platform_get_drvdata (pdev); -gpio_free_array (e750_audio_gpios,ARRAY_SIZE (e750_audio_gpios)); -snd_soc_unregister_card (card);return 0 ; }
sound/soc/pxa/e800_wm9712.c +1 -4
@@ -119,7 +119,7 @@ static int e800_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);
@@ -130,10 +130,7 @@ static int e800_probe(struct platform_device *pdev)static int e800_remove (struct platform_device *pdev) { -struct snd_soc_card *card =platform_get_drvdata (pdev); -gpio_free_array (e800_audio_gpios,ARRAY_SIZE (e800_audio_gpios)); -snd_soc_unregister_card (card);return 0 ; }
sound/soc/pxa/hx4700.c +1 -3
@@ -193,7 +193,7 @@ static int hx4700_audio_probe(struct platform_device *pdev)return ret; snd_soc_card_hx4700.dev = &pdev->dev; - ret =snd_soc_register_card (&snd_soc_card_hx4700); + ret =devm_snd_soc_register_card (&pdev->dev, &snd_soc_card_hx4700);if (ret)gpio_free_array (hx4700_audio_gpios,ARRAY_SIZE (hx4700_audio_gpios));
@@ -203,8 +203,6 @@ static int hx4700_audio_probe(struct platform_device *pdev)static int hx4700_audio_remove (struct platform_device *pdev) { -snd_soc_unregister_card (&snd_soc_card_hx4700); -gpio_set_value (GPIO92_HX4700_HP_DRIVER ,0 );gpio_set_value (GPIO107_HX4700_SPK_nSD,0 );
sound/soc/pxa/imote2.c +1 -10
@@ -72,28 +72,19 @@ static int imote2_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret)dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);return ret; } -static int imote2_remove (struct platform_device *pdev) -{ -struct snd_soc_card *card =platform_get_drvdata (pdev); - -snd_soc_unregister_card (card); -return 0 ; -} -static struct platform_driver imote2_driver = { .driver = { .name ="imote2-audio" , .pm = &snd_soc_pm_ops, }, .probe = imote2_probe, - .remove = imote2_remove, };module_platform_driver (imote2_driver);
sound/soc/pxa/mioa701_wm9713.c +1 -10
@@ -181,7 +181,7 @@ static int mioa701_wm9713_probe(struct platform_device *pdev)return -ENODEV ; mioa701.dev = &pdev->dev; - rc =snd_soc_register_card (&mioa701); + rc =devm_snd_soc_register_card (&pdev->dev, &mioa701);if (!rc)dev_warn (&pdev->dev,"Be warned that incorrect mixers/muxes setup will" "lead to overheating and possible destruction of your device."
@@ -189,17 +189,8 @@ static int mioa701_wm9713_probe(struct platform_device *pdev)return rc; } -static int mioa701_wm9713_remove (struct platform_device *pdev) -{ -struct snd_soc_card *card =platform_get_drvdata (pdev); - -snd_soc_unregister_card (card); -return 0 ; -} -static struct platform_driver mioa701_wm9713_driver = { .probe = mioa701_wm9713_probe, - .remove = mioa701_wm9713_remove, .driver = { .name ="mioa701-wm9713" , .pm = &snd_soc_pm_ops,
sound/soc/pxa/palm27x.c +1 -8
@@ -140,22 +140,15 @@ static int palm27x_asoc_probe(struct platform_device *pdev) palm27x_asoc.dev = &pdev->dev; - ret =snd_soc_register_card (&palm27x_asoc); + ret =devm_snd_soc_register_card (&pdev->dev, &palm27x_asoc);if (ret)dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);return ret; } -static int palm27x_asoc_remove (struct platform_device *pdev) -{ -snd_soc_unregister_card (&palm27x_asoc); -return 0 ; -} -static struct platform_driver palm27x_wm9712_driver = { .probe = palm27x_asoc_probe, - .remove = palm27x_asoc_remove, .driver = { .name ="palm27x-asoc" , .pm = &snd_soc_pm_ops,
sound/soc/pxa/poodle.c +1 -10
@@ -267,28 +267,19 @@ static int poodle_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret)dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);return ret; } -static int poodle_remove (struct platform_device *pdev) -{ -struct snd_soc_card *card =platform_get_drvdata (pdev); - -snd_soc_unregister_card (card); -return 0 ; -} -static struct platform_driver poodle_driver = { .driver = { .name ="poodle-audio" , .pm = &snd_soc_pm_ops, }, .probe = poodle_probe, - .remove = poodle_remove, };module_platform_driver (poodle_driver);
sound/soc/pxa/spitz.c +1 -4
@@ -305,7 +305,7 @@ static int spitz_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);
@@ -322,9 +322,6 @@ err1:static int spitz_remove (struct platform_device *pdev) { -struct snd_soc_card *card =platform_get_drvdata (pdev); - -snd_soc_unregister_card (card);gpio_free (spitz_mic_gpio);return 0 ; }
sound/soc/pxa/tosa.c +1 -4
@@ -233,7 +233,7 @@ static int tosa_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret) {dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);
@@ -244,10 +244,7 @@ static int tosa_probe(struct platform_device *pdev)static int tosa_remove (struct platform_device *pdev) { -struct snd_soc_card *card =platform_get_drvdata (pdev); -gpio_free (TOSA_GPIO_L_MUTE ); -snd_soc_unregister_card (card);return 0 ; }
sound/soc/pxa/ttc-dkb.c +1 -11
@@ -128,7 +128,7 @@ static int ttc_dkb_probe(struct platform_device *pdev) card->dev = &pdev->dev; - ret =snd_soc_register_card (card); + ret =devm_snd_soc_register_card (&pdev->dev, card);if (ret)dev_err (&pdev->dev,"snd_soc_register_card() failed: %d\n" , ret);
@@ -136,22 +136,12 @@ static int ttc_dkb_probe(struct platform_device *pdev)return ret; } -static int ttc_dkb_remove (struct platform_device *pdev) -{ -struct snd_soc_card *card =platform_get_drvdata (pdev); - -snd_soc_unregister_card (card); - -return 0 ; -} -static struct platform_driver ttc_dkb_driver = { .driver = { .name ="ttc-dkb-audio" , .pm = &snd_soc_pm_ops, }, .probe = ttc_dkb_probe, - .remove = ttc_dkb_remove, };module_platform_driver (ttc_dkb_driver);
Signature · 1 line
2.1.0