Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

7 files changed, 39 insertions, 40 deletions

diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 614a5e114a19..5f94d22c491e 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -361,8 +361,7 @@ fail:
 extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);
 extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);
 
-static int __devinit bbc_i2c_probe(struct platform_device *op,
-                                   const struct of_device_id *match)
+static int __devinit bbc_i2c_probe(struct platform_device *op)
 {
         struct bbc_i2c_bus *bp;
         int err, index = 0;
@@ -413,7 +412,7 @@ static const struct of_device_id bbc_i2c_match[] = {
 };
 MODULE_DEVICE_TABLE(of, bbc_i2c_match);
 
-static struct of_platform_driver bbc_i2c_driver = {
+static struct platform_driver bbc_i2c_driver = {
         .driver = {
                 .name = "bbc_i2c",
                 .owner = THIS_MODULE,
@@ -425,12 +424,12 @@ static struct of_platform_driver bbc_i2c_driver = {
 
 static int __init bbc_i2c_init(void)
 {
-        return of_register_platform_driver(&bbc_i2c_driver);
+        return platform_driver_register(&bbc_i2c_driver);
 }
 
 static void __exit bbc_i2c_exit(void)
 {
-        of_unregister_platform_driver(&bbc_i2c_driver);
+        platform_driver_unregister(&bbc_i2c_driver);
 }
 
 module_init(bbc_i2c_init);
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 1690e53fb84a..740da4465447 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -162,6 +162,7 @@ static const struct file_operations d7s_fops = {
         .compat_ioctl =         d7s_ioctl,
         .open =                 d7s_open,
         .release =              d7s_release,
+        .llseek = noop_llseek,
 };
 
 static struct miscdevice d7s_miscdev = {
@@ -170,8 +171,7 @@ static struct miscdevice d7s_miscdev = {
         .fops           = &d7s_fops
 };
 
-static int __devinit d7s_probe(struct platform_device *op,
-                               const struct of_device_id *match)
+static int __devinit d7s_probe(struct platform_device *op)
 {
         struct device_node *opts;
         int err = -EINVAL;
@@ -265,7 +265,7 @@ static const struct of_device_id d7s_match[] = {
 };
 MODULE_DEVICE_TABLE(of, d7s_match);
 
-static struct of_platform_driver d7s_driver = {
+static struct platform_driver d7s_driver = {
         .driver = {
                 .name = DRIVER_NAME,
                 .owner = THIS_MODULE,
@@ -277,12 +277,12 @@ static struct of_platform_driver d7s_driver = {
 
 static int __init d7s_init(void)
 {
-        return of_register_platform_driver(&d7s_driver);
+        return platform_driver_register(&d7s_driver);
 }
 
 static void __exit d7s_exit(void)
 {
-        of_unregister_platform_driver(&d7s_driver);
+        platform_driver_unregister(&d7s_driver);
 }
 
 module_init(d7s_init);
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 078e5f4520ef..be7b4e56154f 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -720,6 +720,7 @@ static const struct file_operations envctrl_fops = {
 #endif
         .open =                 envctrl_open,
         .release =              envctrl_release,
+        .llseek =               noop_llseek,
 };      
 
 static struct miscdevice envctrl_dev = {
@@ -1027,8 +1028,7 @@ static int kenvctrld(void *__unused)
         return 0;
 }
 
-static int __devinit envctrl_probe(struct platform_device *op,
-                                   const struct of_device_id *match)
+static int __devinit envctrl_probe(struct platform_device *op)
 {
         struct device_node *dp;
         int index, err;
@@ -1128,7 +1128,7 @@ static const struct of_device_id envctrl_match[] = {
 };
 MODULE_DEVICE_TABLE(of, envctrl_match);
 
-static struct of_platform_driver envctrl_driver = {
+static struct platform_driver envctrl_driver = {
         .driver = {
                 .name = DRIVER_NAME,
                 .owner = THIS_MODULE,
@@ -1140,12 +1140,12 @@ static struct of_platform_driver envctrl_driver = {
 
 static int __init envctrl_init(void)
 {
-        return of_register_platform_driver(&envctrl_driver);
+        return platform_driver_register(&envctrl_driver);
 }
 
 static void __exit envctrl_exit(void)
 {
-        of_unregister_platform_driver(&envctrl_driver);
+        platform_driver_unregister(&envctrl_driver);
 }
 
 module_init(envctrl_init);
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 2b4b4b613c48..73dd4e7afaaa 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -160,8 +160,7 @@ static const struct file_operations flash_fops = {
 
 static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops };
 
-static int __devinit flash_probe(struct platform_device *op,
-                                 const struct of_device_id *match)
+static int __devinit flash_probe(struct platform_device *op)
 {
         struct device_node *dp = op->dev.of_node;
         struct device_node *parent;
@@ -207,7 +206,7 @@ static const struct of_device_id flash_match[] = {
 };
 MODULE_DEVICE_TABLE(of, flash_match);
 
-static struct of_platform_driver flash_driver = {
+static struct platform_driver flash_driver = {
         .driver = {
                 .name = "flash",
                 .owner = THIS_MODULE,
@@ -219,12 +218,12 @@ static struct of_platform_driver flash_driver = {
 
 static int __init flash_init(void)
 {
-        return of_register_platform_driver(&flash_driver);
+        return platform_driver_register(&flash_driver);
 }
 
 static void __exit flash_cleanup(void)
 {
-        of_unregister_platform_driver(&flash_driver);
+        platform_driver_unregister(&flash_driver);
 }
 
 module_init(flash_init);
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 4942050dc5b6..6b4678a7900a 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -13,7 +13,7 @@
  * TODO: Erase/program both banks of a 8MB SIMM.
  *
  * It is anticipated that programming an OS Flash will be a routine
- * procedure. In the same time it is exeedingly dangerous because
+ * procedure. In the same time it is exceedingly dangerous because
  * a user can program its OBP flash with OS image and effectively
  * kill the machine.
  *
@@ -27,7 +27,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
@@ -68,6 +68,8 @@
 #define JSF_PART_BITS    2      /* 2 bits of minors to cover JSF_NPART */
 #define JSF_PART_MASK    0x3    /* 2 bits mask */
 
+static DEFINE_MUTEX(jsf_mutex);
+
 /*
  * Access functions.
  * We could ioremap(), but it's easier this way.
@@ -225,7 +227,7 @@ static loff_t jsf_lseek(struct file * file, loff_t offset, int orig)
 {
         loff_t ret;
 
-        lock_kernel();
+        mutex_lock(&jsf_mutex);
         switch (orig) {
                 case 0:
                         file->f_pos = offset;
@@ -238,7 +240,7 @@ static loff_t jsf_lseek(struct file * file, loff_t offset, int orig)
                 default:
                         ret = -EINVAL;
         }
-        unlock_kernel();
+        mutex_unlock(&jsf_mutex);
         return ret;
 }
 
@@ -384,18 +386,18 @@ static int jsf_ioctl_program(void __user *arg)
 
 static long jsf_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
 {
-        lock_kernel();
+        mutex_lock(&jsf_mutex);
         int error = -ENOTTY;
         void __user *argp = (void __user *)arg;
 
         if (!capable(CAP_SYS_ADMIN)) {
-                unlock_kernel();
+                mutex_unlock(&jsf_mutex);
                 return -EPERM;
         }
         switch (cmd) {
         case JSFLASH_IDENT:
                 if (copy_to_user(argp, &jsf0.id, JSFIDSZ)) {
-                        unlock_kernel();
+                        mutex_unlock(&jsf_mutex);
                         return -EFAULT;
                 }
                 break;
@@ -407,7 +409,7 @@ static long jsf_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
                 break;
         }
 
-        unlock_kernel();
+        mutex_unlock(&jsf_mutex);
         return error;
 }
 
@@ -418,17 +420,17 @@ static int jsf_mmap(struct file * file, struct vm_area_struct * vma)
 
 static int jsf_open(struct inode * inode, struct file * filp)
 {
-        lock_kernel();
+        mutex_lock(&jsf_mutex);
         if (jsf0.base == 0) {
-                unlock_kernel();
+                mutex_unlock(&jsf_mutex);
                 return -ENXIO;
         }
         if (test_and_set_bit(0, (void *)&jsf0.busy) != 0) {
-                unlock_kernel();
+                mutex_unlock(&jsf_mutex);
                 return -EBUSY;
         }
 
-        unlock_kernel();
+        mutex_unlock(&jsf_mutex);
         return 0;       /* XXX What security? */
 }
 
@@ -459,13 +461,13 @@ static int jsflash_init(void)
 {
         int rc;
         struct jsflash *jsf;
-        int node;
+        phandle node;
         char banner[128];
         struct linux_prom_registers reg0;
 
         node = prom_getchild(prom_root_node);
         node = prom_searchsiblings(node, "flash-memory");
-        if (node != 0 && node != -1) {
+        if (node != 0 && (s32)node != -1) {
                 if (prom_getproperty(node, "reg",
                     (char *)&reg0, sizeof(reg0)) == -1) {
                         printk("jsflash: no \"reg\" property\n");
diff --git a/drivers/sbus/char/max1617.h b/drivers/sbus/char/max1617.h
index 0bb09c286cb4..cd30819a0a30 100644
--- a/drivers/sbus/char/max1617.h
+++ b/drivers/sbus/char/max1617.h
@@ -6,7 +6,7 @@
 #define MAX1617_CPU_TEMP        0x01 /* Processor die temp in C */
 #define MAX1617_STATUS          0x02 /* Chip status bits        */
 
-/* Read-only versions of changable registers. */
+/* Read-only versions of changeable registers. */
 #define MAX1617_RD_CFG_BYTE     0x03 /* Config register         */
 #define MAX1617_RD_CVRATE_BYTE  0x04 /* Temp conversion rate    */
 #define MAX1617_RD_AMB_HIGHLIM  0x05 /* Ambient high limit      */
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index 1b345be5cc02..ebce9639a26a 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -348,8 +348,7 @@ static void uctrl_get_external_status(struct uctrl_driver *driver)
         
 }
 
-static int __devinit uctrl_probe(struct platform_device *op,
-                                 const struct of_device_id *match)
+static int __devinit uctrl_probe(struct platform_device *op)
 {
         struct uctrl_driver *p;
         int err = -ENOMEM;
@@ -425,7 +424,7 @@ static const struct of_device_id uctrl_match[] = {
 };
 MODULE_DEVICE_TABLE(of, uctrl_match);
 
-static struct of_platform_driver uctrl_driver = {
+static struct platform_driver uctrl_driver = {
         .driver = {
                 .name = "uctrl",
                 .owner = THIS_MODULE,
@@ -438,12 +437,12 @@ static struct of_platform_driver uctrl_driver = {
 
 static int __init uctrl_init(void)
 {
-        return of_register_platform_driver(&uctrl_driver);
+        return platform_driver_register(&uctrl_driver);
 }
 
 static void __exit uctrl_exit(void)
 {
-        of_unregister_platform_driver(&uctrl_driver);
+        platform_driver_unregister(&uctrl_driver);
 }
 
 module_init(uctrl_init);