From 154ff5d5c79b82ae1755305ae2ac9e1bbf11fdda Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Sun, 27 Nov 2011 16:36:04 +0800
Subject: [PATCH] --- yaml --- r: 284095 b: refs/heads/master c:
 a09452eeb776d1444effec5fb862c35efb623704 h: refs/heads/master i:   284093:
 df76fbc9da781f6f686243e65575ff06df1cf875   284091:
 aee49a65fe1ff74a8f8f9d3c9f0b11c2a19b6e0a   284087:
 1a2fa0af10602b62adf942c4119ed297aa20c86c   284079:
 64d6e24d159dc5dc1e9b95dd308195e24dd4c7a2   284063:
 7204264f530797a2adb86795b535531c92c876b5   284031:
 cc028c4e80bcbad0b9f2c616fdca57cdad1c8cd9 v: v3

---
 [refs]                             |  2 +-
 trunk/sound/arm/pxa2xx-ac97.c      | 13 +------------
 trunk/sound/drivers/ml403-ac97cr.c | 13 +------------
 trunk/sound/sh/sh_dac_audio.c      | 13 +------------
 trunk/sound/sparc/cs4231.c         | 13 +------------
 trunk/sound/sparc/dbri.c           | 14 +-------------
 6 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/[refs] b/[refs]
index bbe0a01ab458..a2414e5f68e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51451b8d607374297055c4e08034b39f4be22d33
+refs/heads/master: a09452eeb776d1444effec5fb862c35efb623704
diff --git a/trunk/sound/arm/pxa2xx-ac97.c b/trunk/sound/arm/pxa2xx-ac97.c
index 5d9411839cd7..3a39626a82d6 100644
--- a/trunk/sound/arm/pxa2xx-ac97.c
+++ b/trunk/sound/arm/pxa2xx-ac97.c
@@ -251,18 +251,7 @@ static struct platform_driver pxa2xx_ac97_driver = {
 	},
 };
 
-static int __init pxa2xx_ac97_init(void)
-{
-	return platform_driver_register(&pxa2xx_ac97_driver);
-}
-
-static void __exit pxa2xx_ac97_exit(void)
-{
-	platform_driver_unregister(&pxa2xx_ac97_driver);
-}
-
-module_init(pxa2xx_ac97_init);
-module_exit(pxa2xx_ac97_exit);
+module_platform_driver(pxa2xx_ac97_driver);
 
 MODULE_AUTHOR("Nicolas Pitre");
 MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");
diff --git a/trunk/sound/drivers/ml403-ac97cr.c b/trunk/sound/drivers/ml403-ac97cr.c
index 2ee82c5d9ee5..07ede97bafda 100644
--- a/trunk/sound/drivers/ml403-ac97cr.c
+++ b/trunk/sound/drivers/ml403-ac97cr.c
@@ -1341,15 +1341,4 @@ static struct platform_driver snd_ml403_ac97cr_driver = {
 	},
 };
 
-static int __init alsa_card_ml403_ac97cr_init(void)
-{
-	return platform_driver_register(&snd_ml403_ac97cr_driver);
-}
-
-static void __exit alsa_card_ml403_ac97cr_exit(void)
-{
-	platform_driver_unregister(&snd_ml403_ac97cr_driver);
-}
-
-module_init(alsa_card_ml403_ac97cr_init)
-module_exit(alsa_card_ml403_ac97cr_exit)
+module_platform_driver(snd_ml403_ac97cr_driver);
diff --git a/trunk/sound/sh/sh_dac_audio.c b/trunk/sound/sh/sh_dac_audio.c
index 56bcb46abf0d..b11f82b5718f 100644
--- a/trunk/sound/sh/sh_dac_audio.c
+++ b/trunk/sound/sh/sh_dac_audio.c
@@ -441,15 +441,4 @@ static struct platform_driver driver = {
 	},
 };
 
-static int __init sh_dac_init(void)
-{
-	return platform_driver_register(&driver);
-}
-
-static void __exit sh_dac_exit(void)
-{
-	platform_driver_unregister(&driver);
-}
-
-module_init(sh_dac_init);
-module_exit(sh_dac_exit);
+module_platform_driver(driver);
diff --git a/trunk/sound/sparc/cs4231.c b/trunk/sound/sparc/cs4231.c
index 0e618f82808c..9aa90e0493a8 100644
--- a/trunk/sound/sparc/cs4231.c
+++ b/trunk/sound/sparc/cs4231.c
@@ -2118,15 +2118,4 @@ static struct platform_driver cs4231_driver = {
 	.remove		= __devexit_p(cs4231_remove),
 };
 
-static int __init cs4231_init(void)
-{
-	return platform_driver_register(&cs4231_driver);
-}
-
-static void __exit cs4231_exit(void)
-{
-	platform_driver_unregister(&cs4231_driver);
-}
-
-module_init(cs4231_init);
-module_exit(cs4231_exit);
+module_platform_driver(cs4231_driver);
diff --git a/trunk/sound/sparc/dbri.c b/trunk/sound/sparc/dbri.c
index 4a4f1d740330..6afe087b0ec6 100644
--- a/trunk/sound/sparc/dbri.c
+++ b/trunk/sound/sparc/dbri.c
@@ -2697,16 +2697,4 @@ static struct platform_driver dbri_sbus_driver = {
 	.remove		= __devexit_p(dbri_remove),
 };
 
-/* Probe for the dbri chip and then attach the driver. */
-static int __init dbri_init(void)
-{
-	return platform_driver_register(&dbri_sbus_driver);
-}
-
-static void __exit dbri_exit(void)
-{
-	platform_driver_unregister(&dbri_sbus_driver);
-}
-
-module_init(dbri_init);
-module_exit(dbri_exit);
+module_platform_driver(dbri_sbus_driver);