---

yaml --- r: 336981 b: refs/heads/master c: fd21bfc h: refs/heads/master i: 336979: 040e1cd v: v3
git-mirror · Nov 21, 2012 · fc2833b · fc2833b
1 parent 6e2ada0
commit fc2833b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99ba2fd297ed475dc6782e9029d4da041a85706a
+refs/heads/master: fd21bfcc2d6e8b7fef20f05deef318b0ab7f8004
diff --git a/trunk/drivers/w1/masters/mxc_w1.c b/trunk/drivers/w1/masters/mxc_w1.c
@@ -191,21 +191,9 @@ static struct platform_driver mxc_w1_driver = {
 		   .name = "mxc_w1",
 	},
 	.probe = mxc_w1_probe,
-	.remove = mxc_w1_remove,
+	.remove = __devexit_p(mxc_w1_remove),
 };
-
-static int __init mxc_w1_init(void)
-{
-	return platform_driver_register(&mxc_w1_driver);
-}
-
-static void mxc_w1_exit(void)
-{
-	platform_driver_unregister(&mxc_w1_driver);
-}
-
-module_init(mxc_w1_init);
-module_exit(mxc_w1_exit);
+module_platform_driver(mxc_w1_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Freescale Semiconductors Inc");