Skip to content

Commit

Permalink
pcmcia: convert drivers/pcmcia/* to use module_platform_driver()
Browse files Browse the repository at this point in the history
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: Axel Lin <[email protected]>
Acked-by: Wolfram Sang <[email protected]>
Acked-by: Olof Johansson <[email protected]>
Acked-by: Michael Hennerich <[email protected]>
Acked-by: Marc Zyngier <[email protected]> [for the viper part]
Acked-by: Manuel Lauss <[email protected]> [for the db1xxx_ss.c part]
Signed-off-by: Dominik Brodowski <[email protected]>
  • Loading branch information
AxelLin authored and Dominik Brodowski committed Mar 3, 2012
1 parent d571c79 commit 5d95f8e
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 71 deletions.
13 changes: 1 addition & 12 deletions drivers/pcmcia/bfin_cf_pcmcia.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>");
MODULE_DESCRIPTION("BFIN CF/PCMCIA Driver");
Expand Down
13 changes: 1 addition & 12 deletions drivers/pcmcia/db1xxx_ss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
12 changes: 1 addition & 11 deletions drivers/pcmcia/electra_cf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>");
Expand Down
13 changes: 1 addition & 12 deletions drivers/pcmcia/m8xx_pcmcia.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
13 changes: 1 addition & 12 deletions drivers/pcmcia/pxa2xx_viper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
13 changes: 1 addition & 12 deletions drivers/pcmcia/xxs1500_ss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 5d95f8e

Please sign in to comment.