[PATCH] pcmcia: convert drivers/pcmcia/* to use module_platform_driver()

[PATCH] pcmcia: convert drivers/pcmcia/* to use module_platform_driver()

[Axel Lin]

This patch converts the drivers in drivers/pcmcia/* to use the
module_platform_driver() macro which makes the code smaller and a bit
simpler.

Cc: Michael Hennerich <hennerich@blackfin.uclinux.org>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Marc Zyngier <maz@misterjones.org>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/pcmcia/bfin_cf_pcmcia.c |   13 +------------
 drivers/pcmcia/db1xxx_ss.c      |   13 +------------
 drivers/pcmcia/electra_cf.c     |   12 +-----------
 drivers/pcmcia/m8xx_pcmcia.c    |   13 +------------
 drivers/pcmcia/pxa2xx_viper.c   |   13 +------------
 drivers/pcmcia/xxs1500_ss.c     |   13 +------------
 6 files changed, 6 insertions(+), 71 deletions(-)

diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index 4922139..ac1a223 100644
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -310,18 +310,7 @@ static struct platform_driver bfin_cf_driver = {
 	.remove = __devexit_p(bfin_cf_remove),
 };
 
-static int __init bfin_cf_init(void)
-{
-	return platform_driver_register(&bfin_cf_driver);
-}
-
-static void __exit bfin_cf_exit(void)
-{
-	platform_driver_unregister(&bfin_cf_driver);
-}
-
-module_init(bfin_cf_init);
-module_exit(bfin_cf_exit);
+module_platform_driver(bfin_cf_driver);
 
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver");
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index 5b7c227..ba299a2 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -580,18 +580,7 @@ static struct platform_driver db1x_pcmcia_socket_driver = {
 	.remove		= __devexit_p(db1x_pcmcia_socket_remove),
 };
 
-int __init db1x_pcmcia_socket_load(void)
-{
-	return platform_driver_register(&db1x_pcmcia_socket_driver);
-}
-
-void  __exit db1x_pcmcia_socket_unload(void)
-{
-	platform_driver_unregister(&db1x_pcmcia_socket_driver);
-}
-
-module_init(db1x_pcmcia_socket_load);
-module_exit(db1x_pcmcia_socket_unload);
+module_platform_driver(db1x_pcmcia_socket_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("PCMCIA Socket Services for Alchemy Db/Pb1x00 boards");
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 06ad3e5..7647d23 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -365,17 +365,7 @@ static struct platform_driver electra_cf_driver = {
 	.remove   = electra_cf_remove,
 };
 
-static int __init electra_cf_init(void)
-{
-	return platform_driver_register(&electra_cf_driver);
-}
-module_init(electra_cf_init);
-
-static void __exit electra_cf_exit(void)
-{
-	platform_driver_unregister(&electra_cf_driver);
-}
-module_exit(electra_cf_exit);
+module_platform_driver(electra_cf_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index 271a590..b120928 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -1304,15 +1304,4 @@ static struct platform_driver m8xx_pcmcia_driver = {
 	.remove = m8xx_remove,
 };
 
-static int __init m8xx_init(void)
-{
-	return platform_driver_register(&m8xx_pcmcia_driver);
-}
-
-static void __exit m8xx_exit(void)
-{
-	platform_driver_unregister(&m8xx_pcmcia_driver);
-}
-
-module_init(m8xx_init);
-module_exit(m8xx_exit);
+module_platform_driver(m8xx_pcmcia_driver);
diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c
index 1064b1c..44f5c7f 100644
--- a/drivers/pcmcia/pxa2xx_viper.c
+++ b/drivers/pcmcia/pxa2xx_viper.c
@@ -204,18 +204,7 @@ static struct platform_driver viper_pcmcia_driver = {
 	.id_table	= viper_pcmcia_id_table,
 };
 
-static int __init viper_pcmcia_init(void)
-{
-	return platform_driver_register(&viper_pcmcia_driver);
-}
-
-static void __exit viper_pcmcia_exit(void)
-{
-	return platform_driver_unregister(&viper_pcmcia_driver);
-}
-
-module_init(viper_pcmcia_init);
-module_exit(viper_pcmcia_exit);
+module_platform_driver(viper_pcmcia_driver);
 
 MODULE_DEVICE_TABLE(platform, viper_pcmcia_id_table);
 MODULE_LICENSE("GPL");
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index 379f421..1ceff69 100644
--- a/drivers/pcmcia/xxs1500_ss.c
+++ b/drivers/pcmcia/xxs1500_ss.c
@@ -321,18 +321,7 @@ static struct platform_driver xxs1500_pcmcia_socket_driver = {
 	.remove		= __devexit_p(xxs1500_pcmcia_remove),
 };
 
-int __init xxs1500_pcmcia_socket_load(void)
-{
-	return platform_driver_register(&xxs1500_pcmcia_socket_driver);
-}
-
-void  __exit xxs1500_pcmcia_socket_unload(void)
-{
-	platform_driver_unregister(&xxs1500_pcmcia_socket_driver);
-}
-
-module_init(xxs1500_pcmcia_socket_load);
-module_exit(xxs1500_pcmcia_socket_unload);
+module_platform_driver(xxs1500_pcmcia_socket_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("PCMCIA Socket Services for MyCable XXS1500 systems");
-- 
1.7.5.4

Re: [PATCH] pcmcia: convert drivers/pcmcia/* to use module_platform_driver()

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

On Sun, Nov 27, 2011 at 12:53:06PM +0800, Axel Lin wrote:
> This patch converts the drivers in drivers/pcmcia/* to use the
> module_platform_driver() macro which makes the code smaller and a bit
> simpler.

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] pcmcia: convert drivers/pcmcia/* to use module_platform_driver()

[Olof Johansson]

On Sat, Nov 26, 2011 at 8:53 PM, Axel Lin <axel.lin@gmail.com> wrote:
> This patch converts the drivers in drivers/pcmcia/* to use the
> module_platform_driver() macro which makes the code smaller and a bit
> simpler.
>
> Cc: Michael Hennerich <hennerich@blackfin.uclinux.org>
> Cc: Manuel Lauss <manuel.lauss@gmail.com>
> Cc: Olof Johansson <olof@lixom.net>
> Cc: Marc Zyngier <maz@misterjones.org>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Acked-by: Olof Johansson <olof@lixom.net>


-Olof

Re: [PATCH] pcmcia: convert drivers/pcmcia/* to use module_platform_driver()

[Michael Hennerich]

On 11/27/2011 05:53 AM, Axel Lin wrote:
> This patch converts the drivers in drivers/pcmcia/* to use the
> module_platform_driver() macro which makes the code smaller and a bit
> simpler.
>
> Cc: Michael Hennerich<hennerich@blackfin.uclinux.org>
> Cc: Manuel Lauss<manuel.lauss@gmail.com>
> Cc: Olof Johansson<olof@lixom.net>
> Cc: Marc Zyngier<maz@misterjones.org>
> Signed-off-by: Axel Lin<axel.lin@gmail.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>



-- 
Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif

Re: [PATCH] pcmcia: convert drivers/pcmcia/* to use module_platform_driver()

[Marc Zyngier]

On Sun, 27 Nov 2011 12:53:06 +0800, Axel Lin <axel.lin@gmail.com> wrote:
> This patch converts the drivers in drivers/pcmcia/* to use the
> module_platform_driver() macro which makes the code smaller and a bit
> simpler.
> 
> Cc: Michael Hennerich <hennerich@blackfin.uclinux.org>
> Cc: Manuel Lauss <manuel.lauss@gmail.com>
> Cc: Olof Johansson <olof@lixom.net>
> Cc: Marc Zyngier <maz@misterjones.org>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
>  drivers/pcmcia/bfin_cf_pcmcia.c |   13 +------------
>  drivers/pcmcia/db1xxx_ss.c      |   13 +------------
>  drivers/pcmcia/electra_cf.c     |   12 +-----------
>  drivers/pcmcia/m8xx_pcmcia.c    |   13 +------------
>  drivers/pcmcia/pxa2xx_viper.c   |   13 +------------
>  drivers/pcmcia/xxs1500_ss.c     |   13 +------------
>  6 files changed, 6 insertions(+), 71 deletions(-)
> 

For the viper part:
Acked-by: Marc Zyngier <maz@misterjones.org>
-- 
Who you jivin' with that Cosmik Debris?

Re: [PATCH] pcmcia: convert drivers/pcmcia/* to use module_platform_driver()

[Manuel Lauss]

On Sun, Nov 27, 2011 at 5:53 AM, Axel Lin <axel.lin@gmail.com> wrote:
> This patch converts the drivers in drivers/pcmcia/* to use the
> module_platform_driver() macro which makes the code smaller and a bit
> simpler.
>
> Cc: Michael Hennerich <hennerich@blackfin.uclinux.org>
> Cc: Manuel Lauss <manuel.lauss@gmail.com>
> Cc: Olof Johansson <olof@lixom.net>
> Cc: Marc Zyngier <maz@misterjones.org>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
>  drivers/pcmcia/bfin_cf_pcmcia.c |   13 +------------
>  drivers/pcmcia/db1xxx_ss.c      |   13 +------------
>  drivers/pcmcia/electra_cf.c     |   12 +-----------
>  drivers/pcmcia/m8xx_pcmcia.c    |   13 +------------
>  drivers/pcmcia/pxa2xx_viper.c   |   13 +------------
>  drivers/pcmcia/xxs1500_ss.c     |   13 +------------
>  6 files changed, 6 insertions(+), 71 deletions(-)

For the db1xxx_ss.c part:
Acked-by: Manuel Lauss <manuel.lauss@googlemail.com>

Re: [PATCH] pcmcia: convert drivers/pcmcia/* to use module_platform_driver()

[Dominik Brodowski]

On Sun, Nov 27, 2011 at 12:53:06PM +0800, Axel Lin wrote:
> This patch converts the drivers in drivers/pcmcia/* to use the
> module_platform_driver() macro which makes the code smaller and a bit
> simpler.
> 
> Cc: Michael Hennerich <hennerich@blackfin.uclinux.org>
> Cc: Manuel Lauss <manuel.lauss@gmail.com>
> Cc: Olof Johansson <olof@lixom.net>
> Cc: Marc Zyngier <maz@misterjones.org>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Applied, thanks.

Best,
	Dominik