---

yaml --- r: 365765 b: refs/heads/master c: fb320d0 h: refs/heads/master i: 365763: b004d0d v: v3
git-mirror · Apr 30, 2013 · 46e8c6c · 46e8c6c
1 parent bdfe625
commit 46e8c6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0166fcd09f9343a0371ab47c92e969600512504d
+refs/heads/master: fb320d0a5c037106aa6835a59dc71c6c2eb9c235
diff --git a/trunk/drivers/rtc/rtc-m41t94.c b/trunk/drivers/rtc/rtc-m41t94.c
@@ -124,8 +124,8 @@ static int m41t94_probe(struct spi_device *spi)
 		return res;
 	}
 
-	rtc = rtc_device_register(m41t94_driver.driver.name,
-		&spi->dev, &m41t94_rtc_ops, THIS_MODULE);
+	rtc = devm_rtc_device_register(&spi->dev, m41t94_driver.driver.name,
+					&m41t94_rtc_ops, THIS_MODULE);
 	if (IS_ERR(rtc))
 		return PTR_ERR(rtc);
 
@@ -136,11 +136,6 @@ static int m41t94_probe(struct spi_device *spi)
 
 static int m41t94_remove(struct spi_device *spi)
 {
-	struct rtc_device *rtc = spi_get_drvdata(spi);
-
-	if (rtc)
-		rtc_device_unregister(rtc);
-
 	return 0;
 }