summaryrefslogtreecommitdiffstats
path: root/drivers/char/hw_random/octeon-rng.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 19:55:17 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-03-09 19:55:17 +0100
commitb675b3667f6729dcd1036a2a129b35445947f905 (patch)
tree0d58791e9063d3ca2c352da6f3e7df2bdb876f9d /drivers/char/hw_random/octeon-rng.c
parentInput: max8925_onkey - avoid accessing input device too early (diff)
parentLinux 3.3-rc6 (diff)
downloadlinux-b675b3667f6729dcd1036a2a129b35445947f905.tar.xz
linux-b675b3667f6729dcd1036a2a129b35445947f905.zip
Merge commit 'v3.3-rc6' into next
Diffstat (limited to 'drivers/char/hw_random/octeon-rng.c')
-rw-r--r--drivers/char/hw_random/octeon-rng.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/char/hw_random/octeon-rng.c b/drivers/char/hw_random/octeon-rng.c
index 9cd0feca318c..0943edc782a1 100644
--- a/drivers/char/hw_random/octeon-rng.c
+++ b/drivers/char/hw_random/octeon-rng.c
@@ -131,18 +131,7 @@ static struct platform_driver octeon_rng_driver = {
.remove = __exit_p(octeon_rng_remove),
};
-static int __init octeon_rng_mod_init(void)
-{
- return platform_driver_register(&octeon_rng_driver);
-}
-
-static void __exit octeon_rng_mod_exit(void)
-{
- platform_driver_unregister(&octeon_rng_driver);
-}
-
-module_init(octeon_rng_mod_init);
-module_exit(octeon_rng_mod_exit);
+module_platform_driver(octeon_rng_driver);
MODULE_AUTHOR("David Daney");
MODULE_LICENSE("GPL");