ASoC: Convert blackfin directory to module_platform_driver

PATCH In review Axel Lin 3 participants 3 messages Nov 24, 2011 – Jan 19, 2012

Subsystems (2)

Sound ASoC

lore

Share & tools

lore

Axel Lin

author

2011-11-24 06:45 UTC #0 lore raw

PATCH 1/1 ASoC: Convert blackfin directory to module_platform_driver

Factor out some boilerplate code.

Signed-off-by Axel Lin <[email protected]>

---
 sound/soc/blackfin/bf5xx-ac97-pcm.c     |   12 +-----------
 sound/soc/blackfin/bf5xx-ac97.c         |   13 +------------
 sound/soc/blackfin/bf5xx-i2s-pcm.c      |   12 +-----------
 sound/soc/blackfin/bf5xx-i2s.c          |   13 +------------
 sound/soc/blackfin/bf5xx-tdm-pcm.c      |   12 +-----------
 sound/soc/blackfin/bf5xx-tdm.c          |   12 +-----------
 sound/soc/blackfin/bfin-eval-adau1373.c |   12 +-----------
 sound/soc/blackfin/bfin-eval-adau1701.c |   12 +-----------
 sound/soc/blackfin/bfin-eval-adav80x.c  |   12 +-----------
 9 files changed, 9 insertions(+), 101 deletions(-)

sound/soc/blackfin/bf5xx-ac97-pcm.c +1 ~~-11~~

index 56815c1..fcff583 100644
@@ -475,17 +475,7 @@ static struct platform_driver bf5xx_pcm_driver = {
 	.remove = __devexit_p(bf5xx_soc_platform_remove),
 };
 
-static int __init snd_bf5xx_pcm_init(void)
-{
-	return platform_driver_register(&bf5xx_pcm_driver);
-}
-module_init(snd_bf5xx_pcm_init);
-
-static void __exit snd_bf5xx_pcm_exit(void)
-{
-	platform_driver_unregister(&bf5xx_pcm_driver);
-}
-module_exit(snd_bf5xx_pcm_exit);
+module_platform_driver(bf5xx_pcm_driver);
 
 MODULE_AUTHOR("Cliff Cai");
 MODULE_DESCRIPTION("ADI Blackfin AC97 PCM DMA module");

sound/soc/blackfin/bf5xx-ac97.c +1 ~~-12~~

index 6d21625..f4e9dc4 100644
@@ -375,18 +375,7 @@ static struct platform_driver asoc_bfin_ac97_driver = {
 	.remove = __devexit_p(asoc_bfin_ac97_remove),
 };
 
-static int __init bfin_ac97_init(void)
-{
-	return platform_driver_register(&asoc_bfin_ac97_driver);
-}
-module_init(bfin_ac97_init);
-
-static void __exit bfin_ac97_exit(void)
-{
-	platform_driver_unregister(&asoc_bfin_ac97_driver);
-}
-module_exit(bfin_ac97_exit);
-
+module_platform_driver(asoc_bfin_ac97_driver);
 
 MODULE_AUTHOR("Roy Huang");
 MODULE_DESCRIPTION("AC97 driver for ADI Blackfin");

sound/soc/blackfin/bf5xx-i2s-pcm.c +1 ~~-11~~

index 7565e15..6ec3d41 100644
@@ -314,17 +314,7 @@ static struct platform_driver bfin_i2s_pcm_driver = {
 	.remove = __devexit_p(bfin_i2s_soc_platform_remove),
 };
 
-static int __init snd_bfin_i2s_pcm_init(void)
-{
-	return platform_driver_register(&bfin_i2s_pcm_driver);
-}
-module_init(snd_bfin_i2s_pcm_init);
-
-static void __exit snd_bfin_i2s_pcm_exit(void)
-{
-	platform_driver_unregister(&bfin_i2s_pcm_driver);
-}
-module_exit(snd_bfin_i2s_pcm_exit);
+module_platform_driver(bfin_i2s_pcm_driver);
 
 MODULE_AUTHOR("Cliff Cai");
 MODULE_DESCRIPTION("ADI Blackfin I2S PCM DMA module");

sound/soc/blackfin/bf5xx-i2s.c +1 ~~-12~~

index 00cc3e0..a400633 100644
@@ -288,18 +288,7 @@ static struct platform_driver bfin_i2s_driver = {
 	},
 };
 
-static int __init bfin_i2s_init(void)
-{
-	return platform_driver_register(&bfin_i2s_driver);
-}
-
-static void __exit bfin_i2s_exit(void)
-{
-	platform_driver_unregister(&bfin_i2s_driver);
-}
-
-module_init(bfin_i2s_init);
-module_exit(bfin_i2s_exit);
+module_platform_driver(bfin_i2s_driver);
 
 /* Module information */
 MODULE_AUTHOR("Cliff Cai");

sound/soc/blackfin/bf5xx-tdm-pcm.c +1 ~~-11~~

index c95cc03..4406f9a 100644
@@ -339,17 +339,7 @@ static struct platform_driver bfin_tdm_driver = {
 	.remove = __devexit_p(bf5xx_soc_platform_remove),
 };
 
-static int __init snd_bfin_tdm_init(void)
-{
-	return platform_driver_register(&bfin_tdm_driver);
-}
-module_init(snd_bfin_tdm_init);
-
-static void __exit snd_bfin_tdm_exit(void)
-{
-	platform_driver_unregister(&bfin_tdm_driver);
-}
-module_exit(snd_bfin_tdm_exit);
+module_platform_driver(bfin_tdm_driver);
 
 MODULE_AUTHOR("Barry Song");
 MODULE_DESCRIPTION("ADI Blackfin TDM PCM DMA module");

sound/soc/blackfin/bf5xx-tdm.c +1 ~~-11~~

index a822d1e..bf65e0e 100644
@@ -314,17 +314,7 @@ static struct platform_driver bfin_tdm_driver = {
 	},
 };
 
-static int __init bfin_tdm_init(void)
-{
-	return platform_driver_register(&bfin_tdm_driver);
-}
-module_init(bfin_tdm_init);
-
-static void __exit bfin_tdm_exit(void)
-{
-	platform_driver_unregister(&bfin_tdm_driver);
-}
-module_exit(bfin_tdm_exit);
+module_platform_driver(bfin_tdm_driver);
 
 /* Module information */
 MODULE_AUTHOR("Barry Song");

sound/soc/blackfin/bfin-eval-adau1373.c +1 ~~-11~~

index 8df2a3b..85ed39a 100644
@@ -184,17 +184,7 @@ static struct platform_driver bfin_eval_adau1373_driver = {
 	.remove = __devexit_p(bfin_eval_adau1373_remove),
 };
 
-static int __init bfin_eval_adau1373_init(void)
-{
-	return platform_driver_register(&bfin_eval_adau1373_driver);
-}
-module_init(bfin_eval_adau1373_init);
-
-static void __exit bfin_eval_adau1373_exit(void)
-{
-	platform_driver_unregister(&bfin_eval_adau1373_driver);
-}
-module_exit(bfin_eval_adau1373_exit);
+module_platform_driver(bfin_eval_adau1373_driver);
 
 MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
 MODULE_DESCRIPTION("ALSA SoC bfin adau1373 driver");

sound/soc/blackfin/bfin-eval-adau1701.c +1 ~~-11~~

index e5550ac..1a88fe9 100644
@@ -121,17 +121,7 @@ static struct platform_driver bfin_eval_adau1701_driver = {
 	.remove = __devexit_p(bfin_eval_adau1701_remove),
 };
 
-static int __init bfin_eval_adau1701_init(void)
-{
-	return platform_driver_register(&bfin_eval_adau1701_driver);
-}
-module_init(bfin_eval_adau1701_init);
-
-static void __exit bfin_eval_adau1701_exit(void)
-{
-	platform_driver_unregister(&bfin_eval_adau1701_driver);
-}
-module_exit(bfin_eval_adau1701_exit);
+module_platform_driver(bfin_eval_adau1701_driver);
 
 MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
 MODULE_DESCRIPTION("ALSA SoC bfin ADAU1701 driver");

sound/soc/blackfin/bfin-eval-adav80x.c +1 ~~-11~~

index 897cfa6..0bc995f 100644
@@ -157,17 +157,7 @@ static struct platform_driver bfin_eval_adav80x_driver = {
 	.id_table = bfin_eval_adav80x_ids,
 };
 
-static int __init bfin_eval_adav80x_init(void)
-{
-	return platform_driver_register(&bfin_eval_adav80x_driver);
-}
-module_init(bfin_eval_adav80x_init);
-
-static void __exit bfin_eval_adav80x_exit(void)
-{
-	platform_driver_unregister(&bfin_eval_adav80x_driver);
-}
-module_exit(bfin_eval_adav80x_exit);
+module_platform_driver(bfin_eval_adav80x_driver);
 
 MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
 MODULE_DESCRIPTION("ALSA SoC bfin adav80x driver");

Signature · 1 line

1.7.5.4

Lars-Peter Clausen

Acked-by on v1 1/1

2011-11-24 07:34 UTC #1 lore raw

Quoted 3 lines · Axel Lin

Factor out some boilerplate code.
Signed-off-by Axel Lin <[email protected]>

Acked-by Lars-Peter Clausen <[email protected]>

Quoted 12 lines

---
 sound/soc/blackfin/bf5xx-ac97-pcm.c     |   12 +-----------
 sound/soc/blackfin/bf5xx-ac97.c         |   13 +------------
 sound/soc/blackfin/bf5xx-i2s-pcm.c      |   12 +-----------
 sound/soc/blackfin/bf5xx-i2s.c          |   13 +------------
 sound/soc/blackfin/bf5xx-tdm-pcm.c      |   12 +-----------
 sound/soc/blackfin/bf5xx-tdm.c          |   12 +-----------
 sound/soc/blackfin/bfin-eval-adau1373.c |   12 +-----------
 sound/soc/blackfin/bfin-eval-adau1701.c |   12 +-----------
 sound/soc/blackfin/bfin-eval-adav80x.c  |   12 +-----------
 9 files changed, 9 insertions(+), 101 deletions(-)

Barry Song

Acked-by on v1 1/1

2012-01-19 01:53 UTC #2 lore raw

In reply to Axel Lin

2011/11/24 Axel Lin <[email protected]>:

Quoted 3 lines

Factor out some boilerplate code.
Signed-off-by Axel Lin <[email protected]>

Acked-by Barry Song <[email protected]>

Quoted 222 lines

---
sound/soc/blackfin/bf5xx-ac97-pcm.c | 12 +----------- sound/soc/blackfin/bf5xx-ac97.c | 13 +------------ sound/soc/blackfin/bf5xx-i2s-pcm.c | 12 +----------- sound/soc/blackfin/bf5xx-i2s.c | 13 +------------ sound/soc/blackfin/bf5xx-tdm-pcm.c | 12 +----------- sound/soc/blackfin/bf5xx-tdm.c | 12 +----------- sound/soc/blackfin/bfin-eval-adau1373.c | 12 +----------- sound/soc/blackfin/bfin-eval-adau1701.c | 12 +----------- sound/soc/blackfin/bfin-eval-adav80x.c | 12 +-----------

 9 files changed, 9 insertions(+), 101 deletions(-)

sound/soc/blackfin/bf5xx-ac97-pcm.c +1 ~~-11~~

index 56815c1..fcff583 100644
@@ -475,17 +475,7 @@ static struct platform_driver bf5xx_pcm_driver = {
        .remove = __devexit_p(bf5xx_soc_platform_remove),
  };
 
-static int __init snd_bf5xx_pcm_init(void)
-{
-       return platform_driver_register(&bf5xx_pcm_driver);
-}
-module_init(snd_bf5xx_pcm_init);
-
-static void __exit snd_bf5xx_pcm_exit(void)
-{
-       platform_driver_unregister(&bf5xx_pcm_driver);
-}
-module_exit(snd_bf5xx_pcm_exit);
+module_platform_driver(bf5xx_pcm_driver);
 
  MODULE_AUTHOR("Cliff Cai");
  MODULE_DESCRIPTION("ADI Blackfin AC97 PCM DMA module");

sound/soc/blackfin/bf5xx-ac97.c +1 ~~-12~~

index 6d21625..f4e9dc4 100644
@@ -375,18 +375,7 @@ static struct platform_driver asoc_bfin_ac97_driver = {
        .remove = __devexit_p(asoc_bfin_ac97_remove),
  };
 
-static int __init bfin_ac97_init(void)
-{
-       return platform_driver_register(&asoc_bfin_ac97_driver);
-}
-module_init(bfin_ac97_init);
-
-static void __exit bfin_ac97_exit(void)
-{
-       platform_driver_unregister(&asoc_bfin_ac97_driver);
-}
-module_exit(bfin_ac97_exit);
-
+module_platform_driver(asoc_bfin_ac97_driver);
 
  MODULE_AUTHOR("Roy Huang");
  MODULE_DESCRIPTION("AC97 driver for ADI Blackfin");

sound/soc/blackfin/bf5xx-i2s-pcm.c +1 ~~-11~~

index 7565e15..6ec3d41 100644
@@ -314,17 +314,7 @@ static struct platform_driver bfin_i2s_pcm_driver = {
        .remove = __devexit_p(bfin_i2s_soc_platform_remove),
  };
 
-static int __init snd_bfin_i2s_pcm_init(void)
-{
-       return platform_driver_register(&bfin_i2s_pcm_driver);
-}
-module_init(snd_bfin_i2s_pcm_init);
-
-static void __exit snd_bfin_i2s_pcm_exit(void)
-{
-       platform_driver_unregister(&bfin_i2s_pcm_driver);
-}
-module_exit(snd_bfin_i2s_pcm_exit);
+module_platform_driver(bfin_i2s_pcm_driver);
 
  MODULE_AUTHOR("Cliff Cai");
  MODULE_DESCRIPTION("ADI Blackfin I2S PCM DMA module");

sound/soc/blackfin/bf5xx-i2s.c +1 ~~-12~~

index 00cc3e0..a400633 100644
@@ -288,18 +288,7 @@ static struct platform_driver bfin_i2s_driver = {
        },
  };
 
-static int __init bfin_i2s_init(void)
-{
-       return platform_driver_register(&bfin_i2s_driver);
-}
-
-static void __exit bfin_i2s_exit(void)
-{
-       platform_driver_unregister(&bfin_i2s_driver);
-}
-
-module_init(bfin_i2s_init);
-module_exit(bfin_i2s_exit);
+module_platform_driver(bfin_i2s_driver);
 
  /* Module information */
  MODULE_AUTHOR("Cliff Cai");

sound/soc/blackfin/bf5xx-tdm-pcm.c +1 ~~-11~~

index c95cc03..4406f9a 100644
@@ -339,17 +339,7 @@ static struct platform_driver bfin_tdm_driver = {
        .remove = __devexit_p(bf5xx_soc_platform_remove),
  };
 
-static int __init snd_bfin_tdm_init(void)
-{
-       return platform_driver_register(&bfin_tdm_driver);
-}
-module_init(snd_bfin_tdm_init);
-
-static void __exit snd_bfin_tdm_exit(void)
-{
-       platform_driver_unregister(&bfin_tdm_driver);
-}
-module_exit(snd_bfin_tdm_exit);
+module_platform_driver(bfin_tdm_driver);
 
  MODULE_AUTHOR("Barry Song");
  MODULE_DESCRIPTION("ADI Blackfin TDM PCM DMA module");

sound/soc/blackfin/bf5xx-tdm.c +1 ~~-11~~

index a822d1e..bf65e0e 100644
@@ -314,17 +314,7 @@ static struct platform_driver bfin_tdm_driver = {
        },
  };
 
-static int __init bfin_tdm_init(void)
-{
-       return platform_driver_register(&bfin_tdm_driver);
-}
-module_init(bfin_tdm_init);
-
-static void __exit bfin_tdm_exit(void)
-{
-       platform_driver_unregister(&bfin_tdm_driver);
-}
-module_exit(bfin_tdm_exit);
+module_platform_driver(bfin_tdm_driver);
 
  /* Module information */
  MODULE_AUTHOR("Barry Song");

sound/soc/blackfin/bfin-eval-adau1373.c +1 ~~-11~~

index 8df2a3b..85ed39a 100644
@@ -184,17 +184,7 @@ static struct platform_driver bfin_eval_adau1373_driver = {
        .remove = __devexit_p(bfin_eval_adau1373_remove),
  };
 
-static int __init bfin_eval_adau1373_init(void)
-{
-       return platform_driver_register(&bfin_eval_adau1373_driver);
-}
-module_init(bfin_eval_adau1373_init);
-
-static void __exit bfin_eval_adau1373_exit(void)
-{
-       platform_driver_unregister(&bfin_eval_adau1373_driver);
-}
-module_exit(bfin_eval_adau1373_exit);
+module_platform_driver(bfin_eval_adau1373_driver);
 
  MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
  MODULE_DESCRIPTION("ALSA SoC bfin adau1373 driver");

sound/soc/blackfin/bfin-eval-adau1701.c +1 ~~-11~~

index e5550ac..1a88fe9 100644
@@ -121,17 +121,7 @@ static struct platform_driver bfin_eval_adau1701_driver = {
        .remove = __devexit_p(bfin_eval_adau1701_remove),
  };
 
-static int __init bfin_eval_adau1701_init(void)
-{
-       return platform_driver_register(&bfin_eval_adau1701_driver);
-}
-module_init(bfin_eval_adau1701_init);
-
-static void __exit bfin_eval_adau1701_exit(void)
-{
-       platform_driver_unregister(&bfin_eval_adau1701_driver);
-}
-module_exit(bfin_eval_adau1701_exit);
+module_platform_driver(bfin_eval_adau1701_driver);
 
  MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
  MODULE_DESCRIPTION("ALSA SoC bfin ADAU1701 driver");

sound/soc/blackfin/bfin-eval-adav80x.c +1 ~~-12~~

index 897cfa6..0bc995f 100644
@@ -157,17 +157,7 @@ static struct platform_driver bfin_eval_adav80x_driver = {
        .id_table = bfin_eval_adav80x_ids,
  };
 
-static int __init bfin_eval_adav80x_init(void)
-{
-       return platform_driver_register(&bfin_eval_adav80x_driver);
-}
-module_init(bfin_eval_adav80x_init);
-
-static void __exit bfin_eval_adav80x_exit(void)
-{
-       platform_driver_unregister(&bfin_eval_adav80x_driver);
-}
-module_exit(bfin_eval_adav80x_exit);
+module_platform_driver(bfin_eval_adav80x_driver);
 
  MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
  MODULE_DESCRIPTION("ALSA SoC bfin adav80x driver");
--

Quoted 4 lines

1.7.5.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel