Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / arch / cris / arch-v10 / drivers / pcf8563.c

diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c
index 8c830eefc89c4e9a07e480b78d32747475f35ffa..c263b8232dbcdfa6148d026db5253a4effc3c6a2 100644 (file)
--- a/arch/cris/arch-v10/drivers/pcf8563.c
+++ b/arch/cris/arch-v10/drivers/pcf8563.c
@@ -4,7 +4,7 @@
  * From Phillips' datasheet:
  *
  * The PCF8563 is a CMOS real-time clock/calendar optimized for low power
- * consumption. A programmable clock output, interupt output and voltage
+ * consumption. A programmable clock output, interrupt output and voltage
  * low detector are also provided. All address and data are transferred
  * serially via two-line bidirectional I2C-bus. Maximum bus speed is
  * 400 kbits/s. The built-in word address register is incremented
@@ -56,7 +56,7 @@ static const unsigned char days_in_month[] =
 
 int pcf8563_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
 
-static struct file_operations pcf8563_fops = {
+static const struct file_operations pcf8563_fops = {
        .owner = THIS_MODULE,
        .ioctl = pcf8563_ioctl,
 };
@@ -180,9 +180,7 @@ err:
 void __exit
 pcf8563_exit(void)
 {
-       if (unregister_chrdev(PCF8563_MAJOR, DEVICE_NAME) < 0) {
-               printk(KERN_INFO "%s: Unable to unregister device.\n", PCF8563_NAME);
-       }
+       unregister_chrdev(PCF8563_MAJOR, DEVICE_NAME);
 }
 
 /*
@@ -311,7 +309,7 @@ pcf8563_register(void)
 {
        pcf8563_init();
        if (register_chrdev(PCF8563_MAJOR, DEVICE_NAME, &pcf8563_fops) < 0) {
-               printk(KERN_INFO "%s: Unable to get major numer %d for RTC device.\n",
+               printk(KERN_INFO "%s: Unable to get major number %d for RTC device.\n",
                       PCF8563_NAME, PCF8563_MAJOR);
                return -1;
        }