5 files changed, 56 insertions, 51 deletions

diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index b1e3e6179e56..2011567005f9 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -58,7 +58,7 @@ rtc_dev_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         unsigned long data;
         ssize_t ret;
 
-        if (count < sizeof(unsigned long))
+        if (count != sizeof(unsigned int) && count < sizeof(unsigned long))
                 return -EINVAL;
 
         add_wait_queue(&rtc->irq_queue, &wait);
@@ -90,11 +90,16 @@ rtc_dev_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
         if (ret == 0) {
                 /* Check for any data updates */
                 if (rtc->ops->read_callback)
-                        data = rtc->ops->read_callback(rtc->class_dev.dev, data);
-
-                ret = put_user(data, (unsigned long __user *)buf);
-                if (ret == 0)
-                        ret = sizeof(unsigned long);
+                        data = rtc->ops->read_callback(rtc->class_dev.dev,
+                                                       data);
+
+                if (sizeof(int) != sizeof(long) &&
+                    count == sizeof(unsigned int))
+                        ret = put_user(data, (unsigned int __user *)buf) ?:
+                                sizeof(unsigned int);
+                else
+                        ret = put_user(data, (unsigned long __user *)buf) ?:
+                                sizeof(unsigned long);
         }
         return ret;
 }
@@ -136,13 +141,13 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
         /* try the driver's ioctl interface */
         if (ops->ioctl) {
                 err = ops->ioctl(class_dev->dev, cmd, arg);
-                if (err != -EINVAL)
+                if (err != -ENOIOCTLCMD)
                         return err;
         }
 
         /* if the driver does not provide the ioctl interface
          * or if that particular ioctl was not implemented
-         * (-EINVAL), we will try to emulate here.
+         * (-ENOIOCTLCMD), we will try to emulate here.
          */
 
         switch (cmd) {
@@ -228,7 +233,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
                 break;
 
         default:
-                err = -EINVAL;
+                err = -ENOTTY;
                 break;
         }
 
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index f6e7ee04f3dc..8c0d1a6739ad 100644
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -48,33 +48,33 @@ static int m48t86_rtc_read_time(struct device *dev, struct rtc_time *tm)
         struct platform_device *pdev = to_platform_device(dev);
         struct m48t86_ops *ops = pdev->dev.platform_data;
 
-        reg = ops->readb(M48T86_REG_B);
+        reg = ops->readbyte(M48T86_REG_B);
 
         if (reg & M48T86_REG_B_DM) {
                 /* data (binary) mode */
-                tm->tm_sec      = ops->readb(M48T86_REG_SEC);
-                tm->tm_min      = ops->readb(M48T86_REG_MIN);
-                tm->tm_hour     = ops->readb(M48T86_REG_HOUR) & 0x3F;
-                tm->tm_mday     = ops->readb(M48T86_REG_DOM);
+                tm->tm_sec      = ops->readbyte(M48T86_REG_SEC);
+                tm->tm_min      = ops->readbyte(M48T86_REG_MIN);
+                tm->tm_hour     = ops->readbyte(M48T86_REG_HOUR) & 0x3F;
+                tm->tm_mday     = ops->readbyte(M48T86_REG_DOM);
                 /* tm_mon is 0-11 */
-                tm->tm_mon      = ops->readb(M48T86_REG_MONTH) - 1;
-                tm->tm_year     = ops->readb(M48T86_REG_YEAR) + 100;
-                tm->tm_wday     = ops->readb(M48T86_REG_DOW);
+                tm->tm_mon      = ops->readbyte(M48T86_REG_MONTH) - 1;
+                tm->tm_year     = ops->readbyte(M48T86_REG_YEAR) + 100;
+                tm->tm_wday     = ops->readbyte(M48T86_REG_DOW);
         } else {
                 /* bcd mode */
-                tm->tm_sec      = BCD2BIN(ops->readb(M48T86_REG_SEC));
-                tm->tm_min      = BCD2BIN(ops->readb(M48T86_REG_MIN));
-                tm->tm_hour     = BCD2BIN(ops->readb(M48T86_REG_HOUR) & 0x3F);
-                tm->tm_mday     = BCD2BIN(ops->readb(M48T86_REG_DOM));
+                tm->tm_sec      = BCD2BIN(ops->readbyte(M48T86_REG_SEC));
+                tm->tm_min      = BCD2BIN(ops->readbyte(M48T86_REG_MIN));
+                tm->tm_hour     = BCD2BIN(ops->readbyte(M48T86_REG_HOUR) & 0x3F);
+                tm->tm_mday     = BCD2BIN(ops->readbyte(M48T86_REG_DOM));
                 /* tm_mon is 0-11 */
-                tm->tm_mon      = BCD2BIN(ops->readb(M48T86_REG_MONTH)) - 1;
-                tm->tm_year     = BCD2BIN(ops->readb(M48T86_REG_YEAR)) + 100;
-                tm->tm_wday     = BCD2BIN(ops->readb(M48T86_REG_DOW));
+                tm->tm_mon      = BCD2BIN(ops->readbyte(M48T86_REG_MONTH)) - 1;
+                tm->tm_year     = BCD2BIN(ops->readbyte(M48T86_REG_YEAR)) + 100;
+                tm->tm_wday     = BCD2BIN(ops->readbyte(M48T86_REG_DOW));
         }
 
         /* correct the hour if the clock is in 12h mode */
         if (!(reg & M48T86_REG_B_H24))
-                if (ops->readb(M48T86_REG_HOUR) & 0x80)
+                if (ops->readbyte(M48T86_REG_HOUR) & 0x80)
                         tm->tm_hour += 12;
 
         return 0;
@@ -86,35 +86,35 @@ static int m48t86_rtc_set_time(struct device *dev, struct rtc_time *tm)
         struct platform_device *pdev = to_platform_device(dev);
         struct m48t86_ops *ops = pdev->dev.platform_data;
 
-        reg = ops->readb(M48T86_REG_B);
+        reg = ops->readbyte(M48T86_REG_B);
 
         /* update flag and 24h mode */
         reg |= M48T86_REG_B_SET | M48T86_REG_B_H24;
-        ops->writeb(reg, M48T86_REG_B);
+        ops->writebyte(reg, M48T86_REG_B);
 
         if (reg & M48T86_REG_B_DM) {
                 /* data (binary) mode */
-                ops->writeb(tm->tm_sec, M48T86_REG_SEC);
-                ops->writeb(tm->tm_min, M48T86_REG_MIN);
-                ops->writeb(tm->tm_hour, M48T86_REG_HOUR);
-                ops->writeb(tm->tm_mday, M48T86_REG_DOM);
-                ops->writeb(tm->tm_mon + 1, M48T86_REG_MONTH);
-                ops->writeb(tm->tm_year % 100, M48T86_REG_YEAR);
-                ops->writeb(tm->tm_wday, M48T86_REG_DOW);
+                ops->writebyte(tm->tm_sec, M48T86_REG_SEC);
+                ops->writebyte(tm->tm_min, M48T86_REG_MIN);
+                ops->writebyte(tm->tm_hour, M48T86_REG_HOUR);
+                ops->writebyte(tm->tm_mday, M48T86_REG_DOM);
+                ops->writebyte(tm->tm_mon + 1, M48T86_REG_MONTH);
+                ops->writebyte(tm->tm_year % 100, M48T86_REG_YEAR);
+                ops->writebyte(tm->tm_wday, M48T86_REG_DOW);
         } else {
                 /* bcd mode */
-                ops->writeb(BIN2BCD(tm->tm_sec), M48T86_REG_SEC);
-                ops->writeb(BIN2BCD(tm->tm_min), M48T86_REG_MIN);
-                ops->writeb(BIN2BCD(tm->tm_hour), M48T86_REG_HOUR);
-                ops->writeb(BIN2BCD(tm->tm_mday), M48T86_REG_DOM);
-                ops->writeb(BIN2BCD(tm->tm_mon + 1), M48T86_REG_MONTH);
-                ops->writeb(BIN2BCD(tm->tm_year % 100), M48T86_REG_YEAR);
-                ops->writeb(BIN2BCD(tm->tm_wday), M48T86_REG_DOW);
+                ops->writebyte(BIN2BCD(tm->tm_sec), M48T86_REG_SEC);
+                ops->writebyte(BIN2BCD(tm->tm_min), M48T86_REG_MIN);
+                ops->writebyte(BIN2BCD(tm->tm_hour), M48T86_REG_HOUR);
+                ops->writebyte(BIN2BCD(tm->tm_mday), M48T86_REG_DOM);
+                ops->writebyte(BIN2BCD(tm->tm_mon + 1), M48T86_REG_MONTH);
+                ops->writebyte(BIN2BCD(tm->tm_year % 100), M48T86_REG_YEAR);
+                ops->writebyte(BIN2BCD(tm->tm_wday), M48T86_REG_DOW);
         }
 
         /* update ended */
         reg &= ~M48T86_REG_B_SET;
-        ops->writeb(reg, M48T86_REG_B);
+        ops->writebyte(reg, M48T86_REG_B);
 
         return 0;
 }
@@ -125,12 +125,12 @@ static int m48t86_rtc_proc(struct device *dev, struct seq_file *seq)
         struct platform_device *pdev = to_platform_device(dev);
         struct m48t86_ops *ops = pdev->dev.platform_data;
 
-        reg = ops->readb(M48T86_REG_B);
+        reg = ops->readbyte(M48T86_REG_B);
 
         seq_printf(seq, "mode\t\t: %s\n",
                  (reg & M48T86_REG_B_DM) ? "binary" : "bcd");
 
-        reg = ops->readb(M48T86_REG_D);
+        reg = ops->readbyte(M48T86_REG_D);
 
         seq_printf(seq, "battery\t\t: %s\n",
                  (reg & M48T86_REG_D_VRT) ? "ok" : "exhausted");
@@ -157,7 +157,7 @@ static int __devinit m48t86_rtc_probe(struct platform_device *dev)
         platform_set_drvdata(dev, rtc);
 
         /* read battery status */
-        reg = ops->readb(M48T86_REG_D);
+        reg = ops->readbyte(M48T86_REG_D);
         dev_info(&dev->dev, "battery %s\n",
                 (reg & M48T86_REG_D_VRT) ? "ok" : "exhausted");
 
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index a23ec54989f6..a997529f8926 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -178,9 +178,9 @@ static int sa1100_rtc_open(struct device *dev)
         return 0;
 
  fail_pi:
-        free_irq(IRQ_RTCAlrm, NULL);
+        free_irq(IRQ_RTCAlrm, dev);
  fail_ai:
-        free_irq(IRQ_RTC1Hz, NULL);
+        free_irq(IRQ_RTC1Hz, dev);
  fail_ui:
         return ret;
 }
@@ -247,7 +247,7 @@ static int sa1100_rtc_ioctl(struct device *dev, unsigned int cmd,
                 rtc_freq = arg;
                 return 0;
         }
-        return -EINVAL;
+        return -ENOIOCTLCMD;
 }
 
 static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm)
@@ -295,7 +295,7 @@ static int sa1100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
 static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)
 {
-        seq_printf(seq, "trim/divider\t: 0x%08x\n", RTTR);
+        seq_printf(seq, "trim/divider\t: 0x%08lx\n", RTTR);
         seq_printf(seq, "alarm_IRQ\t: %s\n",
                         (RTSR & RTSR_ALE) ? "yes" : "no" );
         seq_printf(seq, "update_IRQ\t: %s\n",
diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
index e1f7e8e86daf..e1fa5fe7901f 100644
--- a/drivers/rtc/rtc-test.c
+++ b/drivers/rtc/rtc-test.c
@@ -71,7 +71,7 @@ static int test_rtc_ioctl(struct device *dev, unsigned int cmd,
                 return 0;
 
         default:
-                return -EINVAL;
+                return -ENOIOCTLCMD;
         }
 }
 
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index 4d49fd501198..277596c302e3 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -270,7 +270,7 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
                 epoch = arg;
                 break;
         default:
-                return -EINVAL;
+                return -ENOIOCTLCMD;
         }
 
         return 0;