Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / drivers / rtc / rtc-spear.c

diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c
index e2785479113ca06648949d6c6a78adee92c78367..bb507d23f6cea09e3c2ab80fec144e1acbb1c4a9 100644 (file)
--- a/drivers/rtc/rtc-spear.c
+++ b/drivers/rtc/rtc-spear.c
@@ -235,7 +235,7 @@ static int spear_rtc_read_time(struct device *dev, struct rtc_time *tm)
 static int spear_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
        struct spear_rtc_config *config = dev_get_drvdata(dev);
-       unsigned int time, date, err = 0;
+       unsigned int time, date;
 
        if (tm2bcd(tm) < 0)
                return -EINVAL;
@@ -247,11 +247,8 @@ static int spear_rtc_set_time(struct device *dev, struct rtc_time *tm)
                (tm->tm_year << YEAR_SHIFT);
        writel(time, config->ioaddr + TIME_REG);
        writel(date, config->ioaddr + DATE_REG);
-       err = is_write_complete(config);
-       if (err < 0)
-               return err;
 
-       return 0;
+       return is_write_complete(config);
 }
 
 /*
@@ -295,7 +292,8 @@ static int spear_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
 static int spear_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 {
        struct spear_rtc_config *config = dev_get_drvdata(dev);
-       unsigned int time, date, err = 0;
+       unsigned int time, date;
+       int err;
 
        if (tm2bcd(&alm->time) < 0)
                return -EINVAL;
@@ -357,7 +355,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev)
 {
        struct resource *res;
        struct spear_rtc_config *config;
-       unsigned int status = 0;
+       int status = 0;
        int irq;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);