---

yaml --- r: 365774 b: refs/heads/master c: 92bb34c h: refs/heads/master v: v3
git-mirror · Apr 30, 2013 · ccbf40c · ccbf40c
1 parent b058fdd
commit ccbf40c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d7068c9d505baffc140f23465c5f998c2237b73
+refs/heads/master: 92bb34ca4f3bea48973111d7364f90af2276b344
diff --git a/trunk/drivers/rtc/rtc-rx4581.c b/trunk/drivers/rtc/rtc-rx4581.c
@@ -273,8 +273,8 @@ static int rx4581_probe(struct spi_device *spi)
 	if (res != 0)
 		return res;
 
-	rtc = rtc_device_register("rx4581",
-				&spi->dev, &rx4581_rtc_ops, THIS_MODULE);
+	rtc = devm_rtc_device_register(&spi->dev, "rx4581",
+				&rx4581_rtc_ops, THIS_MODULE);
 	if (IS_ERR(rtc))
 		return PTR_ERR(rtc);
 
@@ -284,9 +284,6 @@ static int rx4581_probe(struct spi_device *spi)
 
 static int rx4581_remove(struct spi_device *spi)
 {
-	struct rtc_device *rtc = dev_get_drvdata(&spi->dev);
-
-	rtc_device_unregister(rtc);
 	return 0;
 }