Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / vhost / test.c

diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index 97fb2f8fa93041a5a6854e580907854e283d80a8..3cc98c07dcd39365d6a379ed2290074f56683bd0 100644 (file)
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -322,18 +322,7 @@ static struct miscdevice vhost_test_misc = {
        "vhost-test",
        &vhost_test_fops,
 };
-
-static int vhost_test_init(void)
-{
-       return misc_register(&vhost_test_misc);
-}
-module_init(vhost_test_init);
-
-static void vhost_test_exit(void)
-{
-       misc_deregister(&vhost_test_misc);
-}
-module_exit(vhost_test_exit);
+module_misc_device(vhost_test_misc);
 
 MODULE_VERSION("0.0.1");
 MODULE_LICENSE("GPL v2");