---

yaml --- r: 365759 b: refs/heads/master c: 6ae15b0 h: refs/heads/master i: 365757: 2c95490 365755: 27c52dc 365751: 4e5a06a 365743: 11b2ec8 365727: 5ec2670 365695: 626697d v: v3
git-mirror · Apr 30, 2013 · a9cb8d0 · a9cb8d0
1 parent ef938dc
commit a9cb8d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c0011dd2fb09d6bcfc0ff4524131a08b0006e47
+refs/heads/master: 6ae15b0eb7f59d9ac82a6ea8c0487782a563aae9
diff --git a/trunk/drivers/rtc/rtc-efi.c b/trunk/drivers/rtc/rtc-efi.c
@@ -191,7 +191,7 @@ static int __init efi_rtc_probe(struct platform_device *dev)
 {
 	struct rtc_device *rtc;
 
-	rtc = rtc_device_register("rtc-efi", &dev->dev, &efi_rtc_ops,
+	rtc = devm_rtc_device_register(&dev->dev, "rtc-efi", &efi_rtc_ops,
 					THIS_MODULE);
 	if (IS_ERR(rtc))
 		return PTR_ERR(rtc);
@@ -203,10 +203,6 @@ static int __init efi_rtc_probe(struct platform_device *dev)
 
 static int __exit efi_rtc_remove(struct platform_device *dev)
 {
-	struct rtc_device *rtc = platform_get_drvdata(dev);
-
-	rtc_device_unregister(rtc);
-
 	return 0;
 }