10 files changed, 82 insertions, 65 deletions

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index e9aa814ddd23..96e8e70fbf1e 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -238,31 +238,32 @@ static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
         rtc_control = CMOS_READ(RTC_CONTROL);
         spin_unlock_irq(&rtc_lock);
 
-        /* REVISIT this assumes PC style usage:  always BCD */
-
-        if (((unsigned)t->time.tm_sec) < 0x60)
-                t->time.tm_sec = bcd2bin(t->time.tm_sec);
-        else
-                t->time.tm_sec = -1;
-        if (((unsigned)t->time.tm_min) < 0x60)
-                t->time.tm_min = bcd2bin(t->time.tm_min);
-        else
-                t->time.tm_min = -1;
-        if (((unsigned)t->time.tm_hour) < 0x24)
-                t->time.tm_hour = bcd2bin(t->time.tm_hour);
-        else
-                t->time.tm_hour = -1;
-
-        if (cmos->day_alrm) {
-                if (((unsigned)t->time.tm_mday) <= 0x31)
-                        t->time.tm_mday = bcd2bin(t->time.tm_mday);
+        if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
+                if (((unsigned)t->time.tm_sec) < 0x60)
+                        t->time.tm_sec = bcd2bin(t->time.tm_sec);
                 else
-                        t->time.tm_mday = -1;
-                if (cmos->mon_alrm) {
-                        if (((unsigned)t->time.tm_mon) <= 0x12)
-                                t->time.tm_mon = bcd2bin(t->time.tm_mon) - 1;
+                        t->time.tm_sec = -1;
+                if (((unsigned)t->time.tm_min) < 0x60)
+                        t->time.tm_min = bcd2bin(t->time.tm_min);
+                else
+                        t->time.tm_min = -1;
+                if (((unsigned)t->time.tm_hour) < 0x24)
+                        t->time.tm_hour = bcd2bin(t->time.tm_hour);
+                else
+                        t->time.tm_hour = -1;
+
+                if (cmos->day_alrm) {
+                        if (((unsigned)t->time.tm_mday) <= 0x31)
+                                t->time.tm_mday = bcd2bin(t->time.tm_mday);
                         else
-                                t->time.tm_mon = -1;
+                                t->time.tm_mday = -1;
+
+                        if (cmos->mon_alrm) {
+                                if (((unsigned)t->time.tm_mon) <= 0x12)
+                                        t->time.tm_mon = bcd2bin(t->time.tm_mon)-1;
+                                else
+                                        t->time.tm_mon = -1;
+                        }
                 }
         }
         t->time.tm_year = -1;
@@ -322,29 +323,26 @@ static void cmos_irq_disable(struct cmos_rtc *cmos, unsigned char mask)
 static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
 {
         struct cmos_rtc *cmos = dev_get_drvdata(dev);
-        unsigned char   mon, mday, hrs, min, sec;
+       unsigned char   mon, mday, hrs, min, sec, rtc_control;
 
         if (!is_valid_irq(cmos->irq))
                 return -EIO;
 
-        /* REVISIT this assumes PC style usage:  always BCD */
-
-        /* Writing 0xff means "don't care" or "match all".  */
-
         mon = t->time.tm_mon + 1;
-        mon = (mon <= 12) ? bin2bcd(mon) : 0xff;
-
         mday = t->time.tm_mday;
-        mday = (mday >= 1 && mday <= 31) ? bin2bcd(mday) : 0xff;
-
         hrs = t->time.tm_hour;
-        hrs = (hrs < 24) ? bin2bcd(hrs) : 0xff;
-
         min = t->time.tm_min;
-        min = (min < 60) ? bin2bcd(min) : 0xff;
-
         sec = t->time.tm_sec;
-        sec = (sec < 60) ? bin2bcd(sec) : 0xff;
+
+        rtc_control = CMOS_READ(RTC_CONTROL);
+        if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
+                /* Writing 0xff means "don't care" or "match all".  */
+                mon = (mon <= 12) ? bin2bcd(mon) : 0xff;
+                mday = (mday >= 1 && mday <= 31) ? bin2bcd(mday) : 0xff;
+                hrs = (hrs < 24) ? bin2bcd(hrs) : 0xff;
+                min = (min < 60) ? bin2bcd(min) : 0xff;
+                sec = (sec < 60) ? bin2bcd(sec) : 0xff;
+        }
 
         spin_lock_irq(&rtc_lock);
 
@@ -478,7 +476,7 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
                         "update_IRQ\t: %s\n"
                         "HPET_emulated\t: %s\n"
                         // "square_wave\t: %s\n"
-                        // "BCD\t\t: %s\n"
+                        "BCD\t\t: %s\n"
                         "DST_enable\t: %s\n"
                         "periodic_freq\t: %d\n"
                         "batt_status\t: %s\n",
@@ -486,7 +484,7 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
                         (rtc_control & RTC_UIE) ? "yes" : "no",
                         is_hpet_enabled() ? "yes" : "no",
                         // (rtc_control & RTC_SQWE) ? "yes" : "no",
-                        // (rtc_control & RTC_DM_BINARY) ? "no" : "yes",
+                        (rtc_control & RTC_DM_BINARY) ? "no" : "yes",
                         (rtc_control & RTC_DST_EN) ? "yes" : "no",
                         cmos->rtc->irq_freq,
                         (valid & RTC_VRT) ? "okay" : "dead");
@@ -519,7 +517,8 @@ static const struct rtc_class_ops cmos_rtc_ops = {
 #define NVRAM_OFFSET    (RTC_REG_D + 1)
 
 static ssize_t
-cmos_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
+cmos_nvram_read(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         int     retval;
@@ -547,7 +546,8 @@ cmos_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
 }
 
 static ssize_t
-cmos_nvram_write(struct kobject *kobj, struct bin_attribute *attr,
+cmos_nvram_write(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         struct cmos_rtc *cmos;
@@ -749,12 +749,11 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
 
         spin_unlock_irq(&rtc_lock);
 
-        /* FIXME teach the alarm code how to handle binary mode;
+        /* FIXME:
          * <asm-generic/rtc.h> doesn't know 12-hour mode either.
          */
-        if (is_valid_irq(rtc_irq) &&
-            (!(rtc_control & RTC_24H) || (rtc_control & (RTC_DM_BINARY)))) {
-                dev_dbg(dev, "only 24-hr BCD mode supported\n");
+       if (is_valid_irq(rtc_irq) && !(rtc_control & RTC_24H)) {
+                dev_warn(dev, "only 24-hr supported\n");
                 retval = -ENXIO;
                 goto cleanup1;
         }
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index 7836c9cec557..48da85e97ca4 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -542,7 +542,8 @@ static void msg_init(struct spi_message *m, struct spi_transfer *x,
 }
 
 static ssize_t
-ds1305_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
+ds1305_nvram_read(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         struct spi_device       *spi;
@@ -572,7 +573,8 @@ ds1305_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
 }
 
 static ssize_t
-ds1305_nvram_write(struct kobject *kobj, struct bin_attribute *attr,
+ds1305_nvram_write(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         struct spi_device       *spi;
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index c4ec5c158aa1..de033b7ac21f 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -556,7 +556,8 @@ static const struct rtc_class_ops ds13xx_rtc_ops = {
 #define NVRAM_SIZE      56
 
 static ssize_t
-ds1307_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
+ds1307_nvram_read(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         struct i2c_client       *client;
@@ -580,7 +581,8 @@ ds1307_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
 }
 
 static ssize_t
-ds1307_nvram_write(struct kobject *kobj, struct bin_attribute *attr,
+ds1307_nvram_write(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         struct i2c_client       *client;
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 06b8566c4532..37268e97de49 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -423,8 +423,9 @@ static const struct rtc_class_ops ds1511_rtc_ops = {
 };
 
  static ssize_t
-ds1511_nvram_read(struct kobject *kobj, struct bin_attribute *ba,
-                                char *buf, loff_t pos, size_t size)
+ds1511_nvram_read(struct file *filp, struct kobject *kobj,
+                  struct bin_attribute *ba,
+                  char *buf, loff_t pos, size_t size)
 {
         ssize_t count;
 
@@ -452,8 +453,9 @@ ds1511_nvram_read(struct kobject *kobj, struct bin_attribute *ba,
 }
 
  static ssize_t
-ds1511_nvram_write(struct kobject *kobj, struct bin_attribute *bin_attr,
-                                char *buf, loff_t pos, size_t size)
+ds1511_nvram_write(struct file *filp, struct kobject *kobj,
+                   struct bin_attribute *bin_attr,
+                   char *buf, loff_t pos, size_t size)
 {
         ssize_t count;
 
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index 244f9994bcbb..ff432e2ca275 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -252,7 +252,7 @@ static const struct rtc_class_ops ds1553_rtc_ops = {
         .update_irq_enable      = ds1553_rtc_update_irq_enable,
 };
 
-static ssize_t ds1553_nvram_read(struct kobject *kobj,
+static ssize_t ds1553_nvram_read(struct file *filp, struct kobject *kobj,
                                  struct bin_attribute *bin_attr,
                                  char *buf, loff_t pos, size_t size)
 {
@@ -267,7 +267,7 @@ static ssize_t ds1553_nvram_read(struct kobject *kobj,
         return count;
 }
 
-static ssize_t ds1553_nvram_write(struct kobject *kobj,
+static ssize_t ds1553_nvram_write(struct file *filp, struct kobject *kobj,
                                   struct bin_attribute *bin_attr,
                                   char *buf, loff_t pos, size_t size)
 {
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 2b4b0bc42d6f..042630c90dd3 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -128,7 +128,7 @@ static const struct rtc_class_ops ds1742_rtc_ops = {
         .set_time       = ds1742_rtc_set_time,
 };
 
-static ssize_t ds1742_nvram_read(struct kobject *kobj,
+static ssize_t ds1742_nvram_read(struct file *filp, struct kobject *kobj,
                                  struct bin_attribute *bin_attr,
                                  char *buf, loff_t pos, size_t size)
 {
@@ -143,7 +143,7 @@ static ssize_t ds1742_nvram_read(struct kobject *kobj,
         return count;
 }
 
-static ssize_t ds1742_nvram_write(struct kobject *kobj,
+static ssize_t ds1742_nvram_write(struct file *filp, struct kobject *kobj,
                                   struct bin_attribute *bin_attr,
                                   char *buf, loff_t pos, size_t size)
 {
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index 60fe266f0f49..038095d99976 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -623,7 +623,7 @@ static ssize_t wdt_read(struct file *file, char __user *buf,
  *      according to their available features. We only actually usefully support
  *      querying capabilities and current status.
  */
-static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+static int wdt_ioctl(struct file *file, unsigned int cmd,
                      unsigned long arg)
 {
         int new_margin, rv;
@@ -676,6 +676,18 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         return -ENOTTY;
 }
 
+static long wdt_unlocked_ioctl(struct file *file, unsigned int cmd,
+                               unsigned long arg)
+{
+        int ret;
+
+        lock_kernel();
+        ret = wdt_ioctl(file, cmd, arg);
+        unlock_kernel();
+
+        return ret;
+}
+
 /**
  *      wdt_open:
  *      @inode: inode of device
@@ -736,7 +748,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
 static const struct file_operations wdt_fops = {
         .owner  = THIS_MODULE,
         .read   = wdt_read,
-        .ioctl  = wdt_ioctl,
+        .unlocked_ioctl = wdt_unlocked_ioctl,
         .write  = wdt_write,
         .open   = wdt_open,
         .release = wdt_release,
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 365ff3ac2348..be8359fdb65a 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -343,7 +343,7 @@ static const struct rtc_class_ops m48t02_rtc_ops = {
         .set_time       = m48t59_rtc_set_time,
 };
 
-static ssize_t m48t59_nvram_read(struct kobject *kobj,
+static ssize_t m48t59_nvram_read(struct file *filp, struct kobject *kobj,
                                 struct bin_attribute *bin_attr,
                                 char *buf, loff_t pos, size_t size)
 {
@@ -363,7 +363,7 @@ static ssize_t m48t59_nvram_read(struct kobject *kobj,
         return cnt;
 }
 
-static ssize_t m48t59_nvram_write(struct kobject *kobj,
+static ssize_t m48t59_nvram_write(struct file *filp, struct kobject *kobj,
                                 struct bin_attribute *bin_attr,
                                 char *buf, loff_t pos, size_t size)
 {
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index b53a00198dbe..3b943673cd3e 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -244,7 +244,7 @@ static const struct rtc_class_ops stk17ta8_rtc_ops = {
         .alarm_irq_enable       = stk17ta8_rtc_alarm_irq_enable,
 };
 
-static ssize_t stk17ta8_nvram_read(struct kobject *kobj,
+static ssize_t stk17ta8_nvram_read(struct file *filp, struct kobject *kobj,
                                  struct bin_attribute *attr, char *buf,
                                  loff_t pos, size_t size)
 {
@@ -259,7 +259,7 @@ static ssize_t stk17ta8_nvram_read(struct kobject *kobj,
         return count;
 }
 
-static ssize_t stk17ta8_nvram_write(struct kobject *kobj,
+static ssize_t stk17ta8_nvram_write(struct file *filp, struct kobject *kobj,
                                   struct bin_attribute *attr, char *buf,
                                   loff_t pos, size_t size)
 {
diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index 20bfc64a15c8..ec6313d15359 100644
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -188,7 +188,7 @@ static const struct rtc_class_ops tx4939_rtc_ops = {
         .alarm_irq_enable       = tx4939_rtc_alarm_irq_enable,
 };
 
-static ssize_t tx4939_rtc_nvram_read(struct kobject *kobj,
+static ssize_t tx4939_rtc_nvram_read(struct file *filp, struct kobject *kobj,
                                      struct bin_attribute *bin_attr,
                                      char *buf, loff_t pos, size_t size)
 {
@@ -207,7 +207,7 @@ static ssize_t tx4939_rtc_nvram_read(struct kobject *kobj,
         return count;
 }
 
-static ssize_t tx4939_rtc_nvram_write(struct kobject *kobj,
+static ssize_t tx4939_rtc_nvram_write(struct file *filp, struct kobject *kobj,
                                       struct bin_attribute *bin_attr,
                                       char *buf, loff_t pos, size_t size)
 {