ASoC: Convert ep93xx directory to module_platform_driver

PATCH In review Axel Lin 3 participants 3 messages Nov 24, 2011

Subsystems (2)

Sound ASoC

lore

Share & tools

lore

Axel Lin

author

2011-11-24 04:08 UTC #0 lore raw

PATCH 1/1 ASoC: Convert ep93xx directory to module_platform_driver

Factor out some boilerplate code.

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

---
 sound/soc/ep93xx/edb93xx.c     |   12 +-----------
 sound/soc/ep93xx/ep93xx-ac97.c |   12 +-----------
 sound/soc/ep93xx/ep93xx-i2s.c  |   13 +------------
 sound/soc/ep93xx/ep93xx-pcm.c  |   13 +------------
 sound/soc/ep93xx/simone.c      |   12 +-----------
 sound/soc/ep93xx/snappercl15.c |   13 +------------
 6 files changed, 6 insertions(+), 69 deletions(-)

sound/soc/ep93xx/edb93xx.c +1 ~~-11~~

index 51930b6..6b90c75 100644
@@ -131,17 +131,7 @@ static struct platform_driver edb93xx_driver = {
 	.remove		= __devexit_p(edb93xx_remove),
 };
 
-static int __init edb93xx_init(void)
-{
-	return platform_driver_register(&edb93xx_driver);
-}
-module_init(edb93xx_init);
-
-static void __exit edb93xx_exit(void)
-{
-	platform_driver_unregister(&edb93xx_driver);
-}
-module_exit(edb93xx_exit);
+module_platform_driver(edb93xx_driver);
 
 MODULE_AUTHOR("Alexander Sverdlin <[email protected]>");
 MODULE_DESCRIPTION("ALSA SoC EDB93xx");

sound/soc/ep93xx/ep93xx-ac97.c +1 ~~-11~~

index 3cd6158..ca0b07a 100644
@@ -449,17 +449,7 @@ static struct platform_driver ep93xx_ac97_driver = {
 	},
 };
 
-static int __init ep93xx_ac97_init(void)
-{
-	return platform_driver_register(&ep93xx_ac97_driver);
-}
-module_init(ep93xx_ac97_init);
-
-static void __exit ep93xx_ac97_exit(void)
-{
-	platform_driver_unregister(&ep93xx_ac97_driver);
-}
-module_exit(ep93xx_ac97_exit);
+module_platform_driver(ep93xx_ac97_driver);
 
 MODULE_DESCRIPTION("EP93xx AC97 ASoC Driver");
 MODULE_AUTHOR("Mika Westerberg <[email protected]>");

sound/soc/ep93xx/ep93xx-i2s.c +1 ~~-12~~

index 099614e..274234b 100644
@@ -464,18 +464,7 @@ static struct platform_driver ep93xx_i2s_driver = {
 	},
 };
 
-static int __init ep93xx_i2s_init(void)
-{
-	return platform_driver_register(&ep93xx_i2s_driver);
-}
-
-static void __exit ep93xx_i2s_exit(void)
-{
-	platform_driver_unregister(&ep93xx_i2s_driver);
-}
-
-module_init(ep93xx_i2s_init);
-module_exit(ep93xx_i2s_exit);
+module_platform_driver(ep93xx_i2s_driver);
 
 MODULE_ALIAS("platform:ep93xx-i2s");
 MODULE_AUTHOR("Ryan Mallon");

sound/soc/ep93xx/ep93xx-pcm.c +1 ~~-12~~

index 23de792..93ec013 100644
@@ -339,18 +339,7 @@ static struct platform_driver ep93xx_pcm_driver = {
 	.remove = __devexit_p(ep93xx_soc_platform_remove),
 };
 
-static int __init ep93xx_soc_platform_init(void)
-{
-	return platform_driver_register(&ep93xx_pcm_driver);
-}
-
-static void __exit ep93xx_soc_platform_exit(void)
-{
-	platform_driver_unregister(&ep93xx_pcm_driver);
-}
-
-module_init(ep93xx_soc_platform_init);
-module_exit(ep93xx_soc_platform_exit);
+module_platform_driver(ep93xx_pcm_driver);
 
 MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("EP93xx ALSA PCM interface");

sound/soc/ep93xx/simone.c +1 ~~-11~~

index 968cb31..1e00b33 100644
@@ -81,17 +81,7 @@ static struct platform_driver simone_driver = {
 	.remove		= __devexit_p(simone_remove),
 };
 
-static int __init simone_init(void)
-{
-	return platform_driver_register(&simone_driver);
-}
-module_init(simone_init);
-
-static void __exit simone_exit(void)
-{
-	platform_driver_unregister(&simone_driver);
-}
-module_exit(simone_exit);
+module_platform_driver(simone_driver);
 
 MODULE_DESCRIPTION("ALSA SoC Simplemachines Sim.One");
 MODULE_AUTHOR("Mika Westerberg <[email protected]>");

sound/soc/ep93xx/snappercl15.c +1 ~~-12~~

index 2cde433..33901d6 100644
@@ -147,18 +147,7 @@ static struct platform_driver snappercl15_driver = {
 	.remove		= __devexit_p(snappercl15_remove),
 };
 
-static int __init snappercl15_init(void)
-{
-	return platform_driver_register(&snappercl15_driver);
-}
-
-static void __exit snappercl15_exit(void)
-{
-	platform_driver_unregister(&snappercl15_driver);
-}
-
-module_init(snappercl15_init);
-module_exit(snappercl15_exit);
+module_platform_driver(snappercl15_driver);
 
 MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("ALSA SoC Snapper CL15");

Signature · 1 line

1.7.5.4

Mika Westerberg

Acked-by on v1 1/1

2011-11-24 05:32 UTC #1 lore raw

Quoted 3 lines · Axel Lin

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

Acked-by Mika Westerberg <[email protected]>

Quoted 154 lines

---
 sound/soc/ep93xx/edb93xx.c     |   12 +-----------
 sound/soc/ep93xx/ep93xx-ac97.c |   12 +-----------
 sound/soc/ep93xx/ep93xx-i2s.c  |   13 +------------
 sound/soc/ep93xx/ep93xx-pcm.c  |   13 +------------
 sound/soc/ep93xx/simone.c      |   12 +-----------
 sound/soc/ep93xx/snappercl15.c |   13 +------------
 6 files changed, 6 insertions(+), 69 deletions(-)

sound/soc/ep93xx/edb93xx.c +1 ~~-11~~

index 51930b6..6b90c75 100644
@@ -131,17 +131,7 @@ static struct platform_driver edb93xx_driver = {
 	.remove		= __devexit_p(edb93xx_remove),
 };
 
-static int __init edb93xx_init(void)
-{
-	return platform_driver_register(&edb93xx_driver);
-}
-module_init(edb93xx_init);
-
-static void __exit edb93xx_exit(void)
-{
-	platform_driver_unregister(&edb93xx_driver);
-}
-module_exit(edb93xx_exit);
+module_platform_driver(edb93xx_driver);
 
 MODULE_AUTHOR("Alexander Sverdlin <[email protected]>");
 MODULE_DESCRIPTION("ALSA SoC EDB93xx");

sound/soc/ep93xx/ep93xx-ac97.c +1 ~~-11~~

index 3cd6158..ca0b07a 100644
@@ -449,17 +449,7 @@ static struct platform_driver ep93xx_ac97_driver = {
 	},
 };
 
-static int __init ep93xx_ac97_init(void)
-{
-	return platform_driver_register(&ep93xx_ac97_driver);
-}
-module_init(ep93xx_ac97_init);
-
-static void __exit ep93xx_ac97_exit(void)
-{
-	platform_driver_unregister(&ep93xx_ac97_driver);
-}
-module_exit(ep93xx_ac97_exit);
+module_platform_driver(ep93xx_ac97_driver);
 
 MODULE_DESCRIPTION("EP93xx AC97 ASoC Driver");
 MODULE_AUTHOR("Mika Westerberg <[email protected]>");

sound/soc/ep93xx/ep93xx-i2s.c +1 ~~-12~~

index 099614e..274234b 100644
@@ -464,18 +464,7 @@ static struct platform_driver ep93xx_i2s_driver = {
 	},
 };
 
-static int __init ep93xx_i2s_init(void)
-{
-	return platform_driver_register(&ep93xx_i2s_driver);
-}
-
-static void __exit ep93xx_i2s_exit(void)
-{
-	platform_driver_unregister(&ep93xx_i2s_driver);
-}
-
-module_init(ep93xx_i2s_init);
-module_exit(ep93xx_i2s_exit);
+module_platform_driver(ep93xx_i2s_driver);
 
 MODULE_ALIAS("platform:ep93xx-i2s");
 MODULE_AUTHOR("Ryan Mallon");

sound/soc/ep93xx/ep93xx-pcm.c +1 ~~-12~~

index 23de792..93ec013 100644
@@ -339,18 +339,7 @@ static struct platform_driver ep93xx_pcm_driver = {
 	.remove = __devexit_p(ep93xx_soc_platform_remove),
 };
 
-static int __init ep93xx_soc_platform_init(void)
-{
-	return platform_driver_register(&ep93xx_pcm_driver);
-}
-
-static void __exit ep93xx_soc_platform_exit(void)
-{
-	platform_driver_unregister(&ep93xx_pcm_driver);
-}
-
-module_init(ep93xx_soc_platform_init);
-module_exit(ep93xx_soc_platform_exit);
+module_platform_driver(ep93xx_pcm_driver);
 
 MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("EP93xx ALSA PCM interface");

sound/soc/ep93xx/simone.c +1 ~~-11~~

index 968cb31..1e00b33 100644
@@ -81,17 +81,7 @@ static struct platform_driver simone_driver = {
 	.remove		= __devexit_p(simone_remove),
 };
 
-static int __init simone_init(void)
-{
-	return platform_driver_register(&simone_driver);
-}
-module_init(simone_init);
-
-static void __exit simone_exit(void)
-{
-	platform_driver_unregister(&simone_driver);
-}
-module_exit(simone_exit);
+module_platform_driver(simone_driver);
 
 MODULE_DESCRIPTION("ALSA SoC Simplemachines Sim.One");
 MODULE_AUTHOR("Mika Westerberg <[email protected]>");

sound/soc/ep93xx/snappercl15.c +1 ~~-12~~

index 2cde433..33901d6 100644
@@ -147,18 +147,7 @@ static struct platform_driver snappercl15_driver = {
 	.remove		= __devexit_p(snappercl15_remove),
 };
 
-static int __init snappercl15_init(void)
-{
-	return platform_driver_register(&snappercl15_driver);
-}
-
-static void __exit snappercl15_exit(void)
-{
-	platform_driver_unregister(&snappercl15_driver);
-}
-
-module_init(snappercl15_init);
-module_exit(snappercl15_exit);
+module_platform_driver(snappercl15_driver);
 
 MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("ALSA SoC Snapper CL15");

Signature · 1 line

1.7.5.4

Alexander Sverdlin

Acked-by

2011-11-24 06:46 UTC #2 lore raw

Quoted 6 lines · Mika Westerberg

Quoted 3 lines · Axel Lin
Factor out some boilerplate code.
Signed-off-by Axel Lin <[email protected]>
Acked-by Mika Westerberg <[email protected]>

Acked-by Alexander Sverdlin <[email protected]>

Quoted 156 lines

Quoted 155 lines

---
 sound/soc/ep93xx/edb93xx.c     |   12 +-----------
 sound/soc/ep93xx/ep93xx-ac97.c |   12 +-----------
 sound/soc/ep93xx/ep93xx-i2s.c  |   13 +------------
 sound/soc/ep93xx/ep93xx-pcm.c  |   13 +------------
 sound/soc/ep93xx/simone.c      |   12 +-----------
 sound/soc/ep93xx/snappercl15.c |   13 +------------
 6 files changed, 6 insertions(+), 69 deletions(-)

sound/soc/ep93xx/edb93xx.c +1 ~~-11~~

index 51930b6..6b90c75 100644
@@ -131,17 +131,7 @@ static struct platform_driver edb93xx_driver = {
 	.remove		= __devexit_p(edb93xx_remove),
 };
 
-static int __init edb93xx_init(void)
-{
-	return platform_driver_register(&edb93xx_driver);
-}
-module_init(edb93xx_init);
-
-static void __exit edb93xx_exit(void)
-{
-	platform_driver_unregister(&edb93xx_driver);
-}
-module_exit(edb93xx_exit);
+module_platform_driver(edb93xx_driver);
 
 MODULE_AUTHOR("Alexander Sverdlin <[email protected]>");
 MODULE_DESCRIPTION("ALSA SoC EDB93xx");

sound/soc/ep93xx/ep93xx-ac97.c +1 ~~-11~~

index 3cd6158..ca0b07a 100644
@@ -449,17 +449,7 @@ static struct platform_driver ep93xx_ac97_driver = {
 	},
 };
 
-static int __init ep93xx_ac97_init(void)
-{
-	return platform_driver_register(&ep93xx_ac97_driver);
-}
-module_init(ep93xx_ac97_init);
-
-static void __exit ep93xx_ac97_exit(void)
-{
-	platform_driver_unregister(&ep93xx_ac97_driver);
-}
-module_exit(ep93xx_ac97_exit);
+module_platform_driver(ep93xx_ac97_driver);
 
 MODULE_DESCRIPTION("EP93xx AC97 ASoC Driver");
 MODULE_AUTHOR("Mika Westerberg <[email protected]>");

sound/soc/ep93xx/ep93xx-i2s.c +1 ~~-12~~

index 099614e..274234b 100644
@@ -464,18 +464,7 @@ static struct platform_driver ep93xx_i2s_driver = {
 	},
 };
 
-static int __init ep93xx_i2s_init(void)
-{
-	return platform_driver_register(&ep93xx_i2s_driver);
-}
-
-static void __exit ep93xx_i2s_exit(void)
-{
-	platform_driver_unregister(&ep93xx_i2s_driver);
-}
-
-module_init(ep93xx_i2s_init);
-module_exit(ep93xx_i2s_exit);
+module_platform_driver(ep93xx_i2s_driver);
 
 MODULE_ALIAS("platform:ep93xx-i2s");
 MODULE_AUTHOR("Ryan Mallon");

sound/soc/ep93xx/ep93xx-pcm.c +1 ~~-12~~

index 23de792..93ec013 100644
@@ -339,18 +339,7 @@ static struct platform_driver ep93xx_pcm_driver = {
 	.remove = __devexit_p(ep93xx_soc_platform_remove),
 };
 
-static int __init ep93xx_soc_platform_init(void)
-{
-	return platform_driver_register(&ep93xx_pcm_driver);
-}
-
-static void __exit ep93xx_soc_platform_exit(void)
-{
-	platform_driver_unregister(&ep93xx_pcm_driver);
-}
-
-module_init(ep93xx_soc_platform_init);
-module_exit(ep93xx_soc_platform_exit);
+module_platform_driver(ep93xx_pcm_driver);
 
 MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("EP93xx ALSA PCM interface");

sound/soc/ep93xx/simone.c +1 ~~-11~~

index 968cb31..1e00b33 100644
@@ -81,17 +81,7 @@ static struct platform_driver simone_driver = {
 	.remove		= __devexit_p(simone_remove),
 };
 
-static int __init simone_init(void)
-{
-	return platform_driver_register(&simone_driver);
-}
-module_init(simone_init);
-
-static void __exit simone_exit(void)
-{
-	platform_driver_unregister(&simone_driver);
-}
-module_exit(simone_exit);
+module_platform_driver(simone_driver);
 
 MODULE_DESCRIPTION("ALSA SoC Simplemachines Sim.One");
 MODULE_AUTHOR("Mika Westerberg <[email protected]>");

sound/soc/ep93xx/snappercl15.c +1 ~~-12~~

index 2cde433..33901d6 100644
@@ -147,18 +147,7 @@ static struct platform_driver snappercl15_driver = {
 	.remove		= __devexit_p(snappercl15_remove),
 };
 
-static int __init snappercl15_init(void)
-{
-	return platform_driver_register(&snappercl15_driver);
-}
-
-static void __exit snappercl15_exit(void)
-{
-	platform_driver_unregister(&snappercl15_driver);
-}
-
-module_init(snappercl15_init);
-module_exit(snappercl15_exit);
+module_platform_driver(snappercl15_driver);
 
 MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("ALSA SoC Snapper CL15");

Signature · 1 line

1.7.5.4