Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver()

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

Cc: David S. Miller <davem@davemloft.net>
Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Cc: Matt Mackall <mpm@selenic.com>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Alexander Clouter <alex@digriz.org.uk>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Axel Lin and committed by
Herbert Xu
b21cb324 341975bf

+7 -80
+1 -11
drivers/char/hw_random/atmel-rng.c
··· 141 141 }, 142 142 }; 143 143 144 - static int __init atmel_trng_init(void) 145 - { 146 - return platform_driver_register(&atmel_trng_driver); 147 - } 148 - module_init(atmel_trng_init); 149 - 150 - static void __exit atmel_trng_exit(void) 151 - { 152 - platform_driver_unregister(&atmel_trng_driver); 153 - } 154 - module_exit(atmel_trng_exit); 144 + module_platform_driver(atmel_trng_driver); 155 145 156 146 MODULE_LICENSE("GPL"); 157 147 MODULE_AUTHOR("Peter Korsgaard <jacmet@sunsite.dk>");
+1 -12
drivers/char/hw_random/n2-drv.c
··· 770 770 .remove = __devexit_p(n2rng_remove), 771 771 }; 772 772 773 - static int __init n2rng_init(void) 774 - { 775 - return platform_driver_register(&n2rng_driver); 776 - } 777 - 778 - static void __exit n2rng_exit(void) 779 - { 780 - platform_driver_unregister(&n2rng_driver); 781 - } 782 - 783 - module_init(n2rng_init); 784 - module_exit(n2rng_exit); 773 + module_platform_driver(n2rng_driver);
+1 -12
drivers/char/hw_random/octeon-rng.c
··· 131 131 .remove = __exit_p(octeon_rng_remove), 132 132 }; 133 133 134 - static int __init octeon_rng_mod_init(void) 135 - { 136 - return platform_driver_register(&octeon_rng_driver); 137 - } 138 - 139 - static void __exit octeon_rng_mod_exit(void) 140 - { 141 - platform_driver_unregister(&octeon_rng_driver); 142 - } 143 - 144 - module_init(octeon_rng_mod_init); 145 - module_exit(octeon_rng_mod_exit); 134 + module_platform_driver(octeon_rng_driver); 146 135 147 136 MODULE_AUTHOR("David Daney"); 148 137 MODULE_LICENSE("GPL");
+1 -11
drivers/char/hw_random/pasemi-rng.c
··· 148 148 .remove = rng_remove, 149 149 }; 150 150 151 - static int __init rng_init(void) 152 - { 153 - return platform_driver_register(&rng_driver); 154 - } 155 - module_init(rng_init); 156 - 157 - static void __exit rng_exit(void) 158 - { 159 - platform_driver_unregister(&rng_driver); 160 - } 161 - module_exit(rng_exit); 151 + module_platform_driver(rng_driver); 162 152 163 153 MODULE_LICENSE("GPL"); 164 154 MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>");
+1 -11
drivers/char/hw_random/picoxcell-rng.c
··· 191 191 }, 192 192 }; 193 193 194 - static int __init picoxcell_trng_init(void) 195 - { 196 - return platform_driver_register(&picoxcell_trng_driver); 197 - } 198 - module_init(picoxcell_trng_init); 199 - 200 - static void __exit picoxcell_trng_exit(void) 201 - { 202 - platform_driver_unregister(&picoxcell_trng_driver); 203 - } 204 - module_exit(picoxcell_trng_exit); 194 + module_platform_driver(picoxcell_trng_driver); 205 195 206 196 MODULE_LICENSE("GPL"); 207 197 MODULE_AUTHOR("Jamie Iles");
+1 -11
drivers/char/hw_random/ppc4xx-rng.c
··· 139 139 .remove = ppc4xx_rng_remove, 140 140 }; 141 141 142 - static int __init ppc4xx_rng_init(void) 143 - { 144 - return platform_driver_register(&ppc4xx_rng_driver); 145 - } 146 - module_init(ppc4xx_rng_init); 147 - 148 - static void __exit ppc4xx_rng_exit(void) 149 - { 150 - platform_driver_unregister(&ppc4xx_rng_driver); 151 - } 152 - module_exit(ppc4xx_rng_exit); 142 + module_platform_driver(ppc4xx_rng_driver); 153 143 154 144 MODULE_LICENSE("GPL"); 155 145 MODULE_AUTHOR("Josh Boyer <jwboyer@linux.vnet.ibm.com>");
+1 -12
drivers/char/hw_random/timeriomem-rng.c
··· 149 149 .remove = __devexit_p(timeriomem_rng_remove), 150 150 }; 151 151 152 - static int __init timeriomem_rng_init(void) 153 - { 154 - return platform_driver_register(&timeriomem_rng_driver); 155 - } 156 - 157 - static void __exit timeriomem_rng_exit(void) 158 - { 159 - platform_driver_unregister(&timeriomem_rng_driver); 160 - } 161 - 162 - module_init(timeriomem_rng_init); 163 - module_exit(timeriomem_rng_exit); 152 + module_platform_driver(timeriomem_rng_driver); 164 153 165 154 MODULE_LICENSE("GPL"); 166 155 MODULE_AUTHOR("Alexander Clouter <alex@digriz.org.uk>");