From a9cb8d019deb8dedacb65bbd9556523e87b175fd Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Mon, 29 Apr 2013 16:19:36 -0700
Subject: [PATCH] --- yaml --- r: 365759 b: refs/heads/master c:
 6ae15b0eb7f59d9ac82a6ea8c0487782a563aae9 h: refs/heads/master i:   365757:
 2c95490affb0fbddf0ece1e8c9f7b08ff5e93243   365755:
 27c52dc7d329eed1636bb65c6c4ff33804b784c7   365751:
 4e5a06a5216c7a1800e8ea52423f47b24a8339c4   365743:
 11b2ec8b713c4a33548bd262c5bad1b4d8660223   365727:
 5ec2670ec5ea07332add9488c3198422bd7e3611   365695:
 626697dd25f514176bfb31811d5efa880df638cd v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/rtc/rtc-efi.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5750fd21cbfa..788e49f33942 100644
--- 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
index e70666272266..b3c8c0b1709d 100644
--- 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;
 }