Merge branch 'master' into gfs2

27 files changed, 103 insertions, 54 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 33a7b720539b..fc766a7a611e 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -27,7 +27,7 @@ config RTC_HCTOSYS
         help
           If you say yes here, the system time will be set using
           the value read from the specified RTC device. This is useful
-          in order to avoid unnecessary fschk runs.
+          in order to avoid unnecessary fsck runs.
 
 config RTC_HCTOSYS_DEVICE
         string "The RTC to read the time from"
@@ -37,6 +37,13 @@ config RTC_HCTOSYS_DEVICE
           The RTC device that will be used as the source for
           the system time, usually rtc0.
 
+config RTC_DEBUG
+        bool "RTC debug support"
+        depends on RTC_CLASS = y
+        help
+          Say yes here to enable debugging support in the RTC framework
+          and individual RTC drivers.
+
 comment "RTC interfaces"
         depends on RTC_CLASS
 
@@ -45,8 +52,8 @@ config RTC_INTF_SYSFS
         depends on RTC_CLASS && SYSFS
         default RTC_CLASS
         help
-          Say yes here if you want to use your RTC using the sysfs
-          interface, /sys/class/rtc/rtcX .
+          Say yes here if you want to use your RTCs using sysfs interfaces,
+          /sys/class/rtc/rtc0 through /sys/.../rtcN.
 
           This driver can also be built as a module. If so, the module
           will be called rtc-sysfs.
@@ -56,8 +63,9 @@ config RTC_INTF_PROC
         depends on RTC_CLASS && PROC_FS
         default RTC_CLASS
         help
-          Say yes here if you want to use your RTC using the proc
-          interface, /proc/driver/rtc .
+          Say yes here if you want to use your first RTC through the proc
+          interface, /proc/driver/rtc.  Other RTCs will not be available
+          through that API.
 
           This driver can also be built as a module. If so, the module
           will be called rtc-proc.
@@ -67,8 +75,11 @@ config RTC_INTF_DEV
         depends on RTC_CLASS
         default RTC_CLASS
         help
-          Say yes here if you want to use your RTC using the dev
-          interface, /dev/rtc .
+          Say yes here if you want to use your RTCs using the /dev
+          interfaces, which "udev" sets up as /dev/rtc0 through
+          /dev/rtcN.  You may want to set up a symbolic link so one
+          of these can be accessed as /dev/rtc, which is a name
+          expected by "hwclock" and some other programs.
 
           This driver can also be built as a module. If so, the module
           will be called rtc-dev.
@@ -78,7 +89,8 @@ config RTC_INTF_DEV_UIE_EMUL
         depends on RTC_INTF_DEV
         help
           Provides an emulation for RTC_UIE if the underlaying rtc chip
-          driver did not provide RTC_UIE ioctls.
+          driver does not expose RTC_UIE ioctls.  Those requests generate
+          once-per-second update interrupts, used for synchronization.
 
 comment "RTC drivers"
         depends on RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index e72d467ab214..3ba5ff6e6800 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -2,6 +2,10 @@
 # Makefile for RTC class/drivers.
 #
 
+ifeq ($(CONFIG_RTC_DEBUG),y)
+        EXTRA_CFLAGS            += -DDEBUG
+endif
+
 obj-$(CONFIG_RTC_LIB)           += rtc-lib.o
 obj-$(CONFIG_RTC_HCTOSYS)       += hctosys.o
 obj-$(CONFIG_RTC_CLASS)         += rtc-core.o
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 1cb61a761cb2..7a0d8ee2de9c 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -39,7 +39,7 @@ static void rtc_device_release(struct class_device *class_dev)
  * Returns the pointer to the new struct class device.
  */
 struct rtc_device *rtc_device_register(const char *name, struct device *dev,
-                                        struct rtc_class_ops *ops,
+                                        const struct rtc_class_ops *ops,
                                         struct module *owner)
 {
         struct rtc_device *rtc;
@@ -142,9 +142,9 @@ static void __exit rtc_exit(void)
         class_destroy(rtc_class);
 }
 
-module_init(rtc_init);
+subsys_initcall(rtc_init);
 module_exit(rtc_exit);
 
-MODULE_AUTHOR("Alessandro Zummo <a.zummo@towerteh.it>");
+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("RTC class support");
 MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-at91.c b/drivers/rtc/rtc-at91.c
index dfd0ce86f6a0..c0714da44920 100644
--- a/drivers/rtc/rtc-at91.c
+++ b/drivers/rtc/rtc-at91.c
@@ -267,7 +267,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id,
         return IRQ_NONE;                /* not handled */
 }
 
-static struct rtc_class_ops at91_rtc_ops = {
+static const struct rtc_class_ops at91_rtc_ops = {
         .ioctl          = at91_rtc_ioctl,
         .read_time      = at91_rtc_readtime,
         .set_time       = at91_rtc_settime,
@@ -307,6 +307,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
                 return PTR_ERR(rtc);
         }
         platform_set_drvdata(pdev, rtc);
+        device_init_wakeup(&pdev->dev, 1);
 
         printk(KERN_INFO "AT91 Real Time Clock driver.\n");
         return 0;
@@ -327,6 +328,7 @@ static int __devexit at91_rtc_remove(struct platform_device *pdev)
 
         rtc_device_unregister(rtc);
         platform_set_drvdata(pdev, NULL);
+        device_init_wakeup(&pdev->dev, 0);
 
         return 0;
 }
@@ -336,6 +338,7 @@ static int __devexit at91_rtc_remove(struct platform_device *pdev)
 /* AT91RM9200 RTC Power management control */
 
 static struct timespec at91_rtc_delta;
+static u32 at91_rtc_imr;
 
 static int at91_rtc_suspend(struct platform_device *pdev, pm_message_t state)
 {
@@ -349,6 +352,18 @@ static int at91_rtc_suspend(struct platform_device *pdev, pm_message_t state)
         rtc_tm_to_time(&tm, &time.tv_sec);
         save_time_delta(&at91_rtc_delta, &time);
 
+        /* this IRQ is shared with DBGU and other hardware which isn't
+         * necessarily doing PM like we are...
+         */
+        at91_rtc_imr = at91_sys_read(AT91_RTC_IMR)
+                        & (AT91_RTC_ALARM|AT91_RTC_SECEV);
+        if (at91_rtc_imr) {
+                if (device_may_wakeup(&pdev->dev))
+                        enable_irq_wake(AT91_ID_SYS);
+                else
+                        at91_sys_write(AT91_RTC_IDR, at91_rtc_imr);
+        }
+
         pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
                 1900 + tm.tm_year, tm.tm_mon, tm.tm_mday,
                 tm.tm_hour, tm.tm_min, tm.tm_sec);
@@ -367,6 +382,13 @@ static int at91_rtc_resume(struct platform_device *pdev)
         rtc_tm_to_time(&tm, &time.tv_sec);
         restore_time_delta(&at91_rtc_delta, &time);
 
+        if (at91_rtc_imr) {
+                if (device_may_wakeup(&pdev->dev))
+                        disable_irq_wake(AT91_ID_SYS);
+                else
+                        at91_sys_write(AT91_RTC_IER, at91_rtc_imr);
+        }
+
         pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __FUNCTION__,
                 1900 + tm.tm_year, tm.tm_mon, tm.tm_mday,
                 tm.tm_hour, tm.tm_min, tm.tm_sec);
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 61a58259c93f..583789c66cdb 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -24,7 +24,7 @@ static int rtc_dev_open(struct inode *inode, struct file *file)
         int err;
         struct rtc_device *rtc = container_of(inode->i_cdev,
                                         struct rtc_device, char_dev);
-        struct rtc_class_ops *ops = rtc->ops;
+        const struct rtc_class_ops *ops = rtc->ops;
 
         /* We keep the lock as long as the device is in use
          * and return immediately if busy
@@ -209,7 +209,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
         int err = 0;
         struct class_device *class_dev = file->private_data;
         struct rtc_device *rtc = to_rtc_device(class_dev);
-        struct rtc_class_ops *ops = rtc->ops;
+        const struct rtc_class_ops *ops = rtc->ops;
         struct rtc_time tm;
         struct rtc_wkalrm alarm;
         void __user *uarg = (void __user *) arg;
@@ -406,7 +406,6 @@ static int rtc_dev_add_device(struct class_device *class_dev,
         rtc->char_dev.owner = rtc->owner;
 
         if (cdev_add(&rtc->char_dev, MKDEV(MAJOR(rtc_devt), rtc->id), 1)) {
-                cdev_del(&rtc->char_dev);
                 dev_err(class_dev->dev,
                         "failed to add char device %d:%d\n",
                         MAJOR(rtc_devt), rtc->id);
@@ -496,7 +495,7 @@ static void __exit rtc_dev_exit(void)
         unregister_chrdev_region(rtc_devt, RTC_DEV_MAX);
 }
 
-module_init(rtc_dev_init);
+subsys_initcall(rtc_dev_init);
 module_exit(rtc_dev_exit);
 
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index e8afb9384786..cc5032b6f42a 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -178,7 +178,7 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)
         return 0;
 }
 
-static struct rtc_class_ops ds13xx_rtc_ops = {
+static const struct rtc_class_ops ds13xx_rtc_ops = {
         .read_time      = ds1307_get_time,
         .set_time       = ds1307_set_time,
 };
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index 209001495474..9647188fee2c 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -18,7 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#define DRV_VERSION "0.1"
+#define DRV_VERSION "0.2"
 
 #define RTC_REG_SIZE            0x2000
 #define RTC_OFFSET              0x1ff0
@@ -250,7 +250,7 @@ static int ds1553_rtc_ioctl(struct device *dev, unsigned int cmd,
         return 0;
 }
 
-static struct rtc_class_ops ds1553_rtc_ops = {
+static const struct rtc_class_ops ds1553_rtc_ops = {
         .read_time      = ds1553_rtc_read_time,
         .set_time       = ds1553_rtc_set_time,
         .read_alarm     = ds1553_rtc_read_alarm,
@@ -357,9 +357,13 @@ static int __init ds1553_rtc_probe(struct platform_device *pdev)
         pdata->rtc = rtc;
         pdata->last_jiffies = jiffies;
         platform_set_drvdata(pdev, pdata);
-        sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
+        ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
+        if (ret)
+                goto out;
         return 0;
  out:
+        if (pdata->rtc)
+                rtc_device_unregister(pdata->rtc);
         if (pdata->irq >= 0)
                 free_irq(pdata->irq, pdev);
         if (ioaddr)
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 9be81fd4737c..9c68ec99afa5 100644
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -156,7 +156,7 @@ static ssize_t show_control(struct device *dev, struct device_attribute *attr, c
 }
 static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);
 
-static struct rtc_class_ops ds1672_rtc_ops = {
+static const struct rtc_class_ops ds1672_rtc_ops = {
         .read_time      = ds1672_rtc_read_time,
         .set_time       = ds1672_rtc_set_time,
         .set_mmss       = ds1672_rtc_set_mmss,
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 8e47e5a06d2a..6273a3d240a2 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#define DRV_VERSION "0.1"
+#define DRV_VERSION "0.2"
 
 #define RTC_REG_SIZE            0x800
 #define RTC_OFFSET              0x7f8
@@ -116,7 +116,7 @@ static int ds1742_rtc_read_time(struct device *dev, struct rtc_time *tm)
         return 0;
 }
 
-static struct rtc_class_ops ds1742_rtc_ops = {
+static const struct rtc_class_ops ds1742_rtc_ops = {
         .read_time      = ds1742_rtc_read_time,
         .set_time       = ds1742_rtc_set_time,
 };
@@ -196,7 +196,7 @@ static int __init ds1742_rtc_probe(struct platform_device *pdev)
                 writeb(sec, ioaddr + RTC_SECONDS);
                 writeb(cen & RTC_CENTURY_MASK, ioaddr + RTC_CONTROL);
         }
-        if (readb(ioaddr + RTC_DAY) & RTC_BATT_FLAG)
+        if (!(readb(ioaddr + RTC_DAY) & RTC_BATT_FLAG))
                 dev_warn(&pdev->dev, "voltage-low detected.\n");
 
         rtc = rtc_device_register(pdev->name, &pdev->dev,
@@ -208,9 +208,13 @@ static int __init ds1742_rtc_probe(struct platform_device *pdev)
         pdata->rtc = rtc;
         pdata->last_jiffies = jiffies;
         platform_set_drvdata(pdev, pdata);
-        sysfs_create_bin_file(&pdev->dev.kobj, &ds1742_nvram_attr);
+        ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1742_nvram_attr);
+        if (ret)
+                goto out;
         return 0;
  out:
+        if (pdata->rtc)
+                rtc_device_unregister(pdata->rtc);
         if (ioaddr)
                 iounmap(ioaddr);
         if (pdata->baseaddr)
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index e1a1169e4664..ef4f147f3c0c 100644
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -73,7 +73,7 @@ static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq)
         return 0;
 }
 
-static struct rtc_class_ops ep93xx_rtc_ops = {
+static const struct rtc_class_ops ep93xx_rtc_ops = {
         .read_time      = ep93xx_rtc_read_time,
         .set_time       = ep93xx_rtc_set_time,
         .set_mmss       = ep93xx_rtc_set_mmss,
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index f324d0a635d4..1c743641b73b 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -390,7 +390,7 @@ static int isl1208_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
         return isl1208_i2c_read_alarm(to_i2c_client(dev), alarm);
 }
 
-static struct rtc_class_ops isl1208_rtc_ops = {
+static const struct rtc_class_ops isl1208_rtc_ops = {
         .proc           = isl1208_rtc_proc,
         .read_time      = isl1208_rtc_read_time,
         .set_time       = isl1208_rtc_set_time,
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index 9812120f3a7c..ba795a4db1e9 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -94,12 +94,12 @@ EXPORT_SYMBOL(rtc_time_to_tm);
 int rtc_valid_tm(struct rtc_time *tm)
 {
         if (tm->tm_year < 70
-                || tm->tm_mon >= 12
+                || ((unsigned)tm->tm_mon) >= 12
                 || tm->tm_mday < 1
                 || tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900)
-                || tm->tm_hour >= 24
-                || tm->tm_min >= 60
-                || tm->tm_sec >= 60)
+                || ((unsigned)tm->tm_hour) >= 24
+                || ((unsigned)tm->tm_min) >= 60
+                || ((unsigned)tm->tm_sec) >= 60)
                 return -EINVAL;
 
         return 0;
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index 8c0d1a6739ad..8ff4a1221f59 100644
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -138,7 +138,7 @@ static int m48t86_rtc_proc(struct device *dev, struct seq_file *seq)
         return 0;
 }
 
-static struct rtc_class_ops m48t86_rtc_ops = {
+static const struct rtc_class_ops m48t86_rtc_ops = {
         .read_time      = m48t86_rtc_read_time,
         .set_time       = m48t86_rtc_set_time,
         .proc           = m48t86_rtc_proc,
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 2c9739562b5c..9eeef964663a 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -207,7 +207,7 @@ static int max6902_set_time(struct device *dev, struct rtc_time *tm)
         return max6902_set_datetime(dev, tm);
 }
 
-static struct rtc_class_ops max6902_rtc_ops = {
+static const struct rtc_class_ops max6902_rtc_ops = {
         .read_time      = max6902_read_time,
         .set_time       = max6902_set_time,
 };
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c
index ba9a583b7b68..a760cf69af90 100644
--- a/drivers/rtc/rtc-pcf8563.c
+++ b/drivers/rtc/rtc-pcf8563.c
@@ -95,7 +95,7 @@ static int pcf8563_get_datetime(struct i2c_client *client, struct rtc_time *tm)
         tm->tm_wday = buf[PCF8563_REG_DW] & 0x07;
         tm->tm_mon = BCD2BIN(buf[PCF8563_REG_MO] & 0x1F) - 1; /* rtc mn 1-12 */
         tm->tm_year = BCD2BIN(buf[PCF8563_REG_YR])
-                + (buf[PCF8563_REG_MO] & PCF8563_MO_C ? 100 : 0);
+                + (buf[PCF8563_REG_MO] & PCF8563_MO_C ? 0 : 100);
 
         dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
@@ -135,7 +135,7 @@ static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm)
 
         /* year and century */
         buf[PCF8563_REG_YR] = BIN2BCD(tm->tm_year % 100);
-        if (tm->tm_year / 100)
+        if (tm->tm_year < 100)
                 buf[PCF8563_REG_MO] |= PCF8563_MO_C;
 
         buf[PCF8563_REG_DW] = tm->tm_wday & 0x07;
@@ -227,7 +227,7 @@ static int pcf8563_rtc_set_time(struct device *dev, struct rtc_time *tm)
         return pcf8563_set_datetime(to_i2c_client(dev), tm);
 }
 
-static struct rtc_class_ops pcf8563_rtc_ops = {
+static const struct rtc_class_ops pcf8563_rtc_ops = {
         .read_time      = pcf8563_rtc_read_time,
         .set_time       = pcf8563_rtc_set_time,
 };
diff --git a/drivers/rtc/rtc-pcf8583.c b/drivers/rtc/rtc-pcf8583.c
index b235a30cb661..5875ebb8c79d 100644
--- a/drivers/rtc/rtc-pcf8583.c
+++ b/drivers/rtc/rtc-pcf8583.c
@@ -273,7 +273,7 @@ static int pcf8583_rtc_set_time(struct device *dev, struct rtc_time *tm)
         return ret;
 }
 
-static struct rtc_class_ops pcf8583_rtc_ops = {
+static const struct rtc_class_ops pcf8583_rtc_ops = {
         .read_time      = pcf8583_rtc_read_time,
         .set_time       = pcf8583_rtc_set_time,
 };
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
index d6d1c5726b0e..739d1a6e14eb 100644
--- a/drivers/rtc/rtc-pl031.c
+++ b/drivers/rtc/rtc-pl031.c
@@ -128,7 +128,7 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
         return 0;
 }
 
-static struct rtc_class_ops pl031_ops = {
+static const struct rtc_class_ops pl031_ops = {
         .open = pl031_open,
         .release = pl031_release,
         .ioctl = pl031_ioctl,
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index cef5f5a3bbf9..d51d8f20e634 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -23,7 +23,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
 {
         int err;
         struct class_device *class_dev = seq->private;
-        struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
+        const struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
         struct rtc_wkalrm alrm;
         struct rtc_time tm;
 
@@ -61,7 +61,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
                         seq_printf(seq, "%02d-", alrm.time.tm_mon + 1);
                 else
                         seq_printf(seq, "**-");
-                if ((unsigned int)alrm.time.tm_mday <= 31)
+                if (alrm.time.tm_mday && (unsigned int)alrm.time.tm_mday <= 31)
                         seq_printf(seq, "%02d\n", alrm.time.tm_mday);
                 else
                         seq_printf(seq, "**\n");
@@ -156,7 +156,7 @@ static void __exit rtc_proc_exit(void)
         class_interface_unregister(&rtc_proc_interface);
 }
 
-module_init(rtc_proc_init);
+subsys_initcall(rtc_proc_init);
 module_exit(rtc_proc_exit);
 
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index 0964d1dba925..f50f3fc353cd 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -23,7 +23,7 @@
 #include <linux/workqueue.h>
 #include <linux/spi/spi.h>
 
-#define DRV_VERSION "0.1"
+#define DRV_VERSION "0.2"
 
 #define RS5C348_REG_SECS        0
 #define RS5C348_REG_MINS        1
@@ -140,7 +140,7 @@ rs5c348_rtc_read_time(struct device *dev, struct rtc_time *tm)
         return 0;
 }
 
-static struct rtc_class_ops rs5c348_rtc_ops = {
+static const struct rtc_class_ops rs5c348_rtc_ops = {
         .read_time      = rs5c348_rtc_read_time,
         .set_time       = rs5c348_rtc_set_time,
 };
@@ -175,8 +175,15 @@ static int __devinit rs5c348_probe(struct spi_device *spi)
                 goto kfree_exit;
         if (ret & (RS5C348_BIT_XSTP | RS5C348_BIT_VDET)) {
                 u8 buf[2];
+                struct rtc_time tm;
                 if (ret & RS5C348_BIT_VDET)
                         dev_warn(&spi->dev, "voltage-low detected.\n");
+                if (ret & RS5C348_BIT_XSTP)
+                        dev_warn(&spi->dev, "oscillator-stop detected.\n");
+                rtc_time_to_tm(0, &tm); /* 1970/1/1 */
+                ret = rs5c348_rtc_set_time(&spi->dev, &tm);
+                if (ret < 0)
+                        goto kfree_exit;
                 buf[0] = RS5C348_CMD_W(RS5C348_REG_CTL2);
                 buf[1] = 0;
                 ret = spi_write_then_read(spi, buf, sizeof(buf), NULL, 0);
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index 7553d797603f..bbdad099471d 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -160,7 +160,7 @@ static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq)
         return 0;
 }
 
-static struct rtc_class_ops rs5c372_rtc_ops = {
+static const struct rtc_class_ops rs5c372_rtc_ops = {
         .proc           = rs5c372_rtc_proc,
         .read_time      = rs5c372_rtc_read_time,
         .set_time       = rs5c372_rtc_set_time,
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 2c7de79c83b9..625dad2eeb4f 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -386,7 +386,7 @@ static void s3c_rtc_release(struct device *dev)
         free_irq(s3c_rtc_tickno, rtc_dev);
 }
 
-static struct rtc_class_ops s3c_rtcops = {
+static const struct rtc_class_ops s3c_rtcops = {
         .open           = s3c_rtc_open,
         .release        = s3c_rtc_release,
         .ioctl          = s3c_rtc_ioctl,
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index ee4b61ee67b0..439c41aea31c 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -303,7 +303,7 @@ static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)
         return 0;
 }
 
-static struct rtc_class_ops sa1100_rtc_ops = {
+static const struct rtc_class_ops sa1100_rtc_ops = {
         .open = sa1100_rtc_open,
         .read_callback = sa1100_rtc_read_callback,
         .release = sa1100_rtc_release,
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 7c1f3d2e53c4..625637b84d33 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -116,7 +116,7 @@ static void __exit rtc_sysfs_exit(void)
         class_interface_unregister(&rtc_sysfs_interface);
 }
 
-module_init(rtc_sysfs_init);
+subsys_initcall(rtc_sysfs_init);
 module_exit(rtc_sysfs_exit);
 
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index e1fa5fe7901f..bc4bd24508a2 100644
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -75,7 +75,7 @@ static int test_rtc_ioctl(struct device *dev, unsigned int cmd,
         }
 }
 
-static struct rtc_class_ops test_rtc_ops = {
+static const struct rtc_class_ops test_rtc_ops = {
         .proc = test_rtc_proc,
         .read_time = test_rtc_read_time,
         .set_time = test_rtc_set_time,
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index a40f400acff6..09b714f1cdc3 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -149,7 +149,7 @@ static int v3020_set_time(struct device *dev, struct rtc_time *dt)
         return 0;
 }
 
-static struct rtc_class_ops v3020_rtc_ops = {
+static const struct rtc_class_ops v3020_rtc_ops = {
         .read_time      = v3020_read_time,
         .set_time       = v3020_set_time,
 };
@@ -169,9 +169,6 @@ static int rtc_probe(struct platform_device *pdev)
         if (pdev->resource[0].flags != IORESOURCE_MEM)
                 return -EBUSY;
 
-        if (pdev == NULL)
-                return -EBUSY;
-
         chip = kzalloc(sizeof *chip, GFP_KERNEL);
         if (!chip)
                 return -ENOMEM;
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index 596764fd29f5..58e5ed0aa127 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -296,7 +296,7 @@ static irqreturn_t rtclong1_interrupt(int irq, void *dev_id, struct pt_regs *reg
         return IRQ_HANDLED;
 }
 
-static struct rtc_class_ops vr41xx_rtc_ops = {
+static const struct rtc_class_ops vr41xx_rtc_ops = {
         .release        = vr41xx_rtc_release,
         .ioctl          = vr41xx_rtc_ioctl,
         .read_time      = vr41xx_rtc_read_time,
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 788b6d1f8f2f..522c69753bbf 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -460,7 +460,7 @@ static int x1205_rtc_proc(struct device *dev, struct seq_file *seq)
         return 0;
 }
 
-static struct rtc_class_ops x1205_rtc_ops = {
+static const struct rtc_class_ops x1205_rtc_ops = {
         .proc           = x1205_rtc_proc,
         .read_time      = x1205_rtc_read_time,
         .set_time       = x1205_rtc_set_time,