From 8baa99d30fa8052e591a80d2f4230e0799a5b289 Mon Sep 17 00:00:00 2001
From: dann frazier <dannf@hp.com>
Date: Tue, 31 Mar 2009 15:24:55 -0700
Subject: [PATCH] --- yaml --- r: 139235 b: refs/heads/master c:
 a8c20cd3f7e2e223898c53adfb74420db5d9ac47 h: refs/heads/master i:   139233:
 888fccf3dc55acd14bd9c7a6a65b7bfd1c5d6a50   139231:
 4c64e1056b8bd593944e39b6cc537a584c8cfef8 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/rtc/rtc-parisc.c | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 77ea6fa7e4c9..2d298d4f6fc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd875d4767f821dabd0feb668623a42e9d48158a
+refs/heads/master: a8c20cd3f7e2e223898c53adfb74420db5d9ac47
diff --git a/trunk/drivers/rtc/rtc-parisc.c b/trunk/drivers/rtc/rtc-parisc.c
index a2ca07ad42cb..c29e91814c9a 100644
--- a/trunk/drivers/rtc/rtc-parisc.c
+++ b/trunk/drivers/rtc/rtc-parisc.c
@@ -25,11 +25,7 @@ static int parisc_get_time(struct device *dev, struct rtc_time *tm)
 
 static int parisc_set_time(struct device *dev, struct rtc_time *tm)
 {
-	int ret;
-
-	ret = set_rtc_time(tm);
-
-	if (ret < 0)
+	if (set_rtc_time(tm) < 0)
 		return -EOPNOTSUPP;
 
 	return 0;
@@ -46,10 +42,8 @@ static int __init parisc_rtc_probe(struct platform_device *dev)
 
 	p = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,
 				THIS_MODULE);
-	if (IS_ERR(p)) {
-		int err = PTR_ERR(p);
-		return err;
-	}
+	if (IS_ERR(p))
+		return PTR_ERR(p);
 
 	platform_set_drvdata(dev, p);