Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d95f8e2 authored by Axel Lin's avatar Axel Lin Committed by Dominik Brodowski
Browse files

pcmcia: convert drivers/pcmcia/* to use module_platform_driver() 



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

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Acked-by: Marc Zyngier <maz@misterjones.org> [for the viper part]
Acked-by: Manuel Lauss <manuel.lauss@googlemail.com> [for the db1xxx_ss.c part]
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent d571c79e

drivers/pcmcia/bfin_cf_pcmcia.c

+1 −12
Original line number Diff line number Diff line
@@ -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");

drivers/pcmcia/db1xxx_ss.c

+1 −12
Original line number Diff line number Diff line
@@ -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");

drivers/pcmcia/electra_cf.c

+1 −11
Original line number Diff line number Diff line
@@ -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>");

drivers/pcmcia/m8xx_pcmcia.c

+1 −12
Original line number Diff line number Diff line
@@ -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);

drivers/pcmcia/pxa2xx_viper.c

+1 −12
Original line number Diff line number Diff line
@@ -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");