summaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authordann frazier <dannf@hp.com>2009-03-31 15:24:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-01 08:59:25 -0700
commita8c20cd3f7e2e223898c53adfb74420db5d9ac47 (patch)
tree63193b6fd5ccdd2e489870eb036eea957a19ffb3 /drivers/rtc
parentcd875d4767f821dabd0feb668623a42e9d48158a (diff)
downloadop-kernel-dev-a8c20cd3f7e2e223898c53adfb74420db5d9ac47.zip
op-kernel-dev-a8c20cd3f7e2e223898c53adfb74420db5d9ac47.tar.gz
rtc-parisc: remove a couple unnecessary variables
Signed-off-by: dann frazier <dannf@hp.com> Reviewed-by: Grant Grundler <grundler@parisc-linux.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-parisc.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-parisc.c b/drivers/rtc/rtc-parisc.c
index a2ca07a..c29e918 100644
--- a/drivers/rtc/rtc-parisc.c
+++ b/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);
OpenPOWER on IntegriCloud