sound: ASoC: Fix an error path in neo1973_wm8753

[linux-2.6-omap-h63xx.git] / drivers / rtc / rtc-r9701.c

diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c
index 926e8fda83c027515f3a2abb30246a4ae721bdd8..395985b339c933a2c0afa17bff1f38fc78e6bf17 100644 (file)
--- a/drivers/rtc/rtc-r9701.c
+++ b/drivers/rtc/rtc-r9701.c
@@ -1,10 +1,9 @@
-/* drivers/rtc/rtc-r9701.c
- *
+/*
  * Driver for Epson RTC-9701JE
  *
  * Copyright (C) 2008 Magnus Damm
  *
- * Based on drivers/rtc/rtc-max6902.c
+ * Based on rtc-max6902.c
  *
  * Copyright (C) 2006 8D Technologies inc.
  * Copyright (C) 2004 Compulab Ltd.
@@ -15,7 +14,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/device.h>
@@ -72,13 +70,11 @@ static int read_regs(struct device *dev, unsigned char *regs, int no_regs)
 
 static int r9701_get_datetime(struct device *dev, struct rtc_time *dt)
 {
-       struct spi_device *spi = to_spi_device(dev);
-       unsigned long time;
        int ret;
        unsigned char buf[] = { RSECCNT, RMINCNT, RHRCNT,
                                RDAYCNT, RMONCNT, RYRCNT };
 
-       ret = read_regs(&spi->dev, buf, ARRAY_SIZE(buf));
+       ret = read_regs(dev, buf, ARRAY_SIZE(buf));
        if (ret)
                return ret;
 
@@ -96,17 +92,7 @@ static int r9701_get_datetime(struct device *dev, struct rtc_time *dt)
         * according to the data sheet. make sure they are valid.
         */
 
-       ret = rtc_valid_tm(dt);
-       if (ret)
-               return ret;
-
-       /* don't bother with yday, wday and isdst.
-        * let the rtc core calculate them for us.
-        */
-
-       rtc_tm_to_time(dt, &time);
-       rtc_time_to_tm(time, dt);
-       return 0;
+       return rtc_valid_tm(dt);
 }
 
 static int r9701_set_datetime(struct device *dev, struct rtc_time *dt)
@@ -118,12 +104,12 @@ static int r9701_set_datetime(struct device *dev, struct rtc_time *dt)
                return -EINVAL;
 
        ret = write_reg(dev, RHRCNT, BIN2BCD(dt->tm_hour));
-       ret |= write_reg(dev, RMINCNT, BIN2BCD(dt->tm_min));
-       ret |= write_reg(dev, RSECCNT, BIN2BCD(dt->tm_sec));
-       ret |= write_reg(dev, RDAYCNT, BIN2BCD(dt->tm_mday));
-       ret |= write_reg(dev, RMONCNT, BIN2BCD(dt->tm_mon + 1));
-       ret |= write_reg(dev, RYRCNT, BIN2BCD(dt->tm_year - 100));
-       ret |= write_reg(dev, RWKCNT, 1 << dt->tm_wday);
+       ret = ret ? ret : write_reg(dev, RMINCNT, BIN2BCD(dt->tm_min));
+       ret = ret ? ret : write_reg(dev, RSECCNT, BIN2BCD(dt->tm_sec));
+       ret = ret ? ret : write_reg(dev, RDAYCNT, BIN2BCD(dt->tm_mday));
+       ret = ret ? ret : write_reg(dev, RMONCNT, BIN2BCD(dt->tm_mon + 1));
+       ret = ret ? ret : write_reg(dev, RYRCNT, BIN2BCD(dt->tm_year - 100));
+       ret = ret ? ret : write_reg(dev, RWKCNT, 1 << dt->tm_wday);
 
        return ret;
 }
@@ -146,10 +132,6 @@ static int __devinit r9701_probe(struct spi_device *spi)
 
        dev_set_drvdata(&spi->dev, rtc);
 
-       spi->mode = SPI_MODE_3;
-       spi->bits_per_word = 8;
-       spi_setup(spi);
-
        tmp = R100CNT;
        res = read_regs(&spi->dev, &tmp, 1);
        if (res || tmp != 0x20) {
@@ -171,7 +153,6 @@ static int __devexit r9701_remove(struct spi_device *spi)
 static struct spi_driver r9701_driver = {
        .driver = {
                .name   = "rtc-r9701",
-               .bus    = &spi_bus_type,
                .owner  = THIS_MODULE,
        },
        .probe  = r9701_probe,