Skip to contentSkip to conversation

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

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

Subsystems (3)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 crypto: convert drivers/crypto/* to use module_platform_driver()

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

Cc James Hsiao <[email protected]>
Cc Sebastian Andrzej Siewior <[email protected]>
Cc Vladimir Zapolskiy <[email protected]>
Cc Jamie Iles <[email protected]>
Cc Kim Phillips <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "David S. Miller" <[email protected]>
---
 drivers/crypto/amcc/crypto4xx_core.c |   13 +------------
 drivers/crypto/caam/ctrl.c           |   13 +------------
 drivers/crypto/mv_cesa.c             |   12 +-----------
 drivers/crypto/picoxcell_crypto.c    |   12 +-----------
 drivers/crypto/s5p-sss.c             |   13 +------------
 drivers/crypto/talitos.c             |   12 +-----------
 6 files changed, 6 insertions(+), 69 deletions(-)
drivers/crypto/amcc/crypto4xx_core.c +1 -12
index 1d103f9..13f8e1a 100644
@@ -1292,18 +1292,7 @@ static struct platform_driver crypto4xx_driver = {
 	.remove		= crypto4xx_remove,
 };
 
-static int __init crypto4xx_init(void)
-{
-	return platform_driver_register(&crypto4xx_driver);
-}
-
-static void __exit crypto4xx_exit(void)
-{
-	platform_driver_unregister(&crypto4xx_driver);
-}
-
-module_init(crypto4xx_init);
-module_exit(crypto4xx_exit);
+module_platform_driver(crypto4xx_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("James Hsiao <[email protected]>");
drivers/crypto/caam/ctrl.c +1 -12
index 73988bb..048bb23 100644
@@ -253,18 +253,7 @@ static struct platform_driver caam_driver = {
 	.remove      = __devexit_p(caam_remove),
 };
 
-static int __init caam_base_init(void)
-{
-	return platform_driver_register(&caam_driver);
-}
-
-static void __exit caam_base_exit(void)
-{
-	return platform_driver_unregister(&caam_driver);
-}
-
-module_init(caam_base_init);
-module_exit(caam_base_exit);
+module_platform_driver(caam_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("FSL CAAM request backend");
drivers/crypto/mv_cesa.c +1 -11
index dcd8bab..597235a 100644
@@ -1128,17 +1128,7 @@ static struct platform_driver marvell_crypto = {
 };
 MODULE_ALIAS("platform:mv_crypto");
 
-static int __init mv_crypto_init(void)
-{
-	return platform_driver_register(&marvell_crypto);
-}
-module_init(mv_crypto_init);
-
-static void __exit mv_crypto_exit(void)
-{
-	platform_driver_unregister(&marvell_crypto);
-}
-module_exit(mv_crypto_exit);
+module_platform_driver(marvell_crypto);
 
 MODULE_AUTHOR("Sebastian Andrzej Siewior <[email protected]>");
 MODULE_DESCRIPTION("Support for Marvell's cryptographic engine");
drivers/crypto/picoxcell_crypto.c +1 -11
index a2b553e..9b1571c 100644
@@ -1854,17 +1854,7 @@ static struct platform_driver spacc_driver = {
 	.id_table	= spacc_id_table,
 };
 
-static int __init spacc_init(void)
-{
-	return platform_driver_register(&spacc_driver);
-}
-module_init(spacc_init);
-
-static void __exit spacc_exit(void)
-{
-	platform_driver_unregister(&spacc_driver);
-}
-module_exit(spacc_exit);
+module_platform_driver(spacc_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jamie Iles");
drivers/crypto/s5p-sss.c +1 -12
index 8115417..3376bca 100644
@@ -683,18 +683,7 @@ static struct platform_driver s5p_aes_crypto = {
 	},
 };
 
-static int __init s5p_aes_mod_init(void)
-{
-	return  platform_driver_register(&s5p_aes_crypto);
-}
-
-static void __exit s5p_aes_mod_exit(void)
-{
-	platform_driver_unregister(&s5p_aes_crypto);
-}
-
-module_init(s5p_aes_mod_init);
-module_exit(s5p_aes_mod_exit);
+module_platform_driver(s5p_aes_crypto);
 
 MODULE_DESCRIPTION("S5PV210 AES hw acceleration support.");
 MODULE_LICENSE("GPL v2");
drivers/crypto/talitos.c +1 -11
index 92c0ca7..230509e 100644
@@ -2894,17 +2894,7 @@ static struct platform_driver talitos_driver = {
 	.remove = talitos_remove,
 };
 
-static int __init talitos_init(void)
-{
-	return platform_driver_register(&talitos_driver);
-}
-module_init(talitos_init);
-
-static void __exit talitos_exit(void)
-{
-	platform_driver_unregister(&talitos_driver);
-}
-module_exit(talitos_exit);
+module_platform_driver(talitos_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kim Phillips <[email protected]>");
Signature · 1 line
1.7.5.4
Acked-by on v1 1/1
#1 lore raw
Quoted 129 lines · Axel Lin

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

Cc James Hsiao<[email protected]>
Cc Sebastian Andrzej Siewior<[email protected]>
Cc Vladimir Zapolskiy<[email protected]>
Cc Jamie Iles<[email protected]>
Cc Kim Phillips<[email protected]>
Cc Herbert Xu<[email protected]>
Cc "David S. Miller"<[email protected]>
---
  drivers/crypto/amcc/crypto4xx_core.c |   13 +------------
  drivers/crypto/caam/ctrl.c           |   13 +------------
  drivers/crypto/mv_cesa.c             |   12 +-----------
  drivers/crypto/picoxcell_crypto.c    |   12 +-----------
  drivers/crypto/s5p-sss.c             |   13 +------------
  drivers/crypto/talitos.c             |   12 +-----------
  6 files changed, 6 insertions(+), 69 deletions(-)
drivers/crypto/amcc/crypto4xx_core.c +1 -12
index 1d103f9..13f8e1a 100644
@@ -1292,18 +1292,7 @@ static struct platform_driver crypto4xx_driver = {
  	.remove		= crypto4xx_remove,
  };
 
-static int __init crypto4xx_init(void)
-{
-	return platform_driver_register(&crypto4xx_driver);
-}
-
-static void __exit crypto4xx_exit(void)
-{
-	platform_driver_unregister(&crypto4xx_driver);
-}
-
-module_init(crypto4xx_init);
-module_exit(crypto4xx_exit);
+module_platform_driver(crypto4xx_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("James Hsiao<[email protected]>");
drivers/crypto/caam/ctrl.c +1 -12
index 73988bb..048bb23 100644
@@ -253,18 +253,7 @@ static struct platform_driver caam_driver = {
  	.remove      = __devexit_p(caam_remove),
  };
 
-static int __init caam_base_init(void)
-{
-	return platform_driver_register(&caam_driver);
-}
-
-static void __exit caam_base_exit(void)
-{
-	return platform_driver_unregister(&caam_driver);
-}
-
-module_init(caam_base_init);
-module_exit(caam_base_exit);
+module_platform_driver(caam_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("FSL CAAM request backend");
drivers/crypto/mv_cesa.c +1 -11
index dcd8bab..597235a 100644
@@ -1128,17 +1128,7 @@ static struct platform_driver marvell_crypto = {
  };
  MODULE_ALIAS("platform:mv_crypto");
 
-static int __init mv_crypto_init(void)
-{
-	return platform_driver_register(&marvell_crypto);
-}
-module_init(mv_crypto_init);
-
-static void __exit mv_crypto_exit(void)
-{
-	platform_driver_unregister(&marvell_crypto);
-}
-module_exit(mv_crypto_exit);
+module_platform_driver(marvell_crypto);
 
  MODULE_AUTHOR("Sebastian Andrzej Siewior<[email protected]>");
  MODULE_DESCRIPTION("Support for Marvell's cryptographic engine");
drivers/crypto/picoxcell_crypto.c +1 -11
index a2b553e..9b1571c 100644
@@ -1854,17 +1854,7 @@ static struct platform_driver spacc_driver = {
  	.id_table	= spacc_id_table,
  };
 
-static int __init spacc_init(void)
-{
-	return platform_driver_register(&spacc_driver);
-}
-module_init(spacc_init);
-
-static void __exit spacc_exit(void)
-{
-	platform_driver_unregister(&spacc_driver);
-}
-module_exit(spacc_exit);
+module_platform_driver(spacc_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Jamie Iles");
drivers/crypto/s5p-sss.c +0 -6
index 8115417..3376bca 100644
@@ -683,18 +683,7 @@ static struct platform_driver s5p_aes_crypto = {
  	},
  };
 
-static int __init s5p_aes_mod_init(void)
-{
-	return  platform_driver_register(&s5p_aes_crypto);
-}
-
-static void __exit s5p_aes_mod_exit(void)

drivers/crypto/s5p-sss.c static struct platform_driver s5p_aes_crypto = { · line 689

Quoted 10 lines
drivers/crypto/s5p-sss.c +1 -6
-{
-	platform_driver_unregister(&s5p_aes_crypto);
-}
-
-module_init(s5p_aes_mod_init);
-module_exit(s5p_aes_mod_exit);
+module_platform_driver(s5p_aes_crypto);
 
  MODULE_DESCRIPTION("S5PV210 AES hw acceleration support.");
  MODULE_LICENSE("GPL v2");

As for me the change looks good, thanks.

Quoted 23 lines
drivers/crypto/talitos.c +1 -11
index 92c0ca7..230509e 100644
@@ -2894,17 +2894,7 @@ static struct platform_driver talitos_driver = {
  	.remove = talitos_remove,
  };
 
-static int __init talitos_init(void)
-{
-	return platform_driver_register(&talitos_driver);
-}
-module_init(talitos_init);
-
-static void __exit talitos_exit(void)
-{
-	platform_driver_unregister(&talitos_driver);
-}
-module_exit(talitos_exit);
+module_platform_driver(talitos_driver);
 
  MODULE_LICENSE("GPL");
  MODULE_AUTHOR("Kim Phillips<[email protected]>");