Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

5 files changed, 4 insertions, 17 deletions

diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index d63f26e666a4..ba1f7497e4b9 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
@@ -987,7 +987,6 @@ asus_proc_add(char *name, proc_writefunc *writefunc,
         proc->write_proc = writefunc;
         proc->read_proc = readfunc;
         proc->data = acpi_driver_data(device);
-        proc->owner = THIS_MODULE;
         proc->uid = asus_uid;
         proc->gid = asus_gid;
         return 0;
@@ -1020,7 +1019,6 @@ static int asus_hotk_add_fs(struct acpi_device *device)
         if (proc) {
                 proc->read_proc = proc_read_info;
                 proc->data = acpi_driver_data(device);
-                proc->owner = THIS_MODULE;
                 proc->uid = asus_uid;
                 proc->gid = asus_gid;
         } else {
@@ -1436,7 +1434,6 @@ static int __init asus_acpi_init(void)
                 printk(KERN_ERR "Asus ACPI: Unable to create /proc entry\n");
                 return -ENODEV;
         }
-        asus_proc_dir->owner = THIS_MODULE;
 
         result = acpi_bus_register_driver(&asus_hotk_driver);
         if (result < 0) {
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 16e11c2ee19a..af9f43021172 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -103,7 +103,7 @@ static void parse_da_table(const struct dmi_header *dm)
         da_num_tokens += tokens;
 }
 
-static void find_tokens(const struct dmi_header *dm)
+static void find_tokens(const struct dmi_header *dm, void *dummy)
 {
         switch (dm->type) {
         case 0xd4: /* Indexed IO */
@@ -356,7 +356,7 @@ static int __init dell_init(void)
         if (!dmi_check_system(dell_device_table))
                 return -ENODEV;
 
-        dmi_walk(find_tokens);
+        dmi_walk(find_tokens, NULL);
 
         if (!da_tokens)  {
                 printk(KERN_INFO "dell-laptop: Unable to find dmi tokens\n");
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index e02edf68a68e..a90ec5cb2f20 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -2167,12 +2167,7 @@ static struct sonypi_compat_s sonypi_compat = {
 
 static int sonypi_misc_fasync(int fd, struct file *filp, int on)
 {
-        int retval;
-
-        retval = fasync_helper(fd, filp, on, &sonypi_compat.fifo_async);
-        if (retval < 0)
-                return retval;
-        return 0;
+        return fasync_helper(fd, filp, on, &sonypi_compat.fifo_async);
 }
 
 static int sonypi_misc_release(struct inode *inode, struct file *file)
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index ba3682c5cde0..a40b075743d9 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -6116,7 +6116,7 @@ static struct ibm_struct volume_driver_data = {
  *      ThinkPads from this same time period (and earlier) probably lack the
  *      tachometer as well.
  *
- *      Unfortunately a lot of ThinkPads with new-style ECs but whose firwmare
+ *      Unfortunately a lot of ThinkPads with new-style ECs but whose firmware
  *      was never fixed by IBM to report the EC firmware version string
  *      probably support the tachometer (like the early X models), so
  *      detecting it is quite hard.  We need more data to know for sure.
@@ -7332,7 +7332,6 @@ static int __init ibm_init(struct ibm_init_struct *iibm)
                         ret = -ENODEV;
                         goto err_out;
                 }
-                entry->owner = THIS_MODULE;
                 entry->data = ibm;
                 entry->read_proc = &dispatch_procfs_read;
                 if (ibm->write)
@@ -7745,7 +7744,6 @@ static int __init thinkpad_acpi_module_init(void)
                 thinkpad_acpi_module_exit();
                 return -ENODEV;
         }
-        proc_dir->owner = THIS_MODULE;
 
         ret = platform_driver_register(&tpacpi_pdriver);
         if (ret) {
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 40e60fc2e596..9f187265db8e 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -679,8 +679,6 @@ static acpi_status __init add_device(void)
                                               toshiba_proc_dir,
                                               (read_proc_t *) dispatch_read,
                                               item);
-                if (proc)
-                        proc->owner = THIS_MODULE;
                 if (proc && item->write_func)
                         proc->write_proc = (write_proc_t *) dispatch_write;
         }
@@ -772,7 +770,6 @@ static int __init toshiba_acpi_init(void)
                 toshiba_acpi_exit();
                 return -ENODEV;
         } else {
-                toshiba_proc_dir->owner = THIS_MODULE;
                 status = add_device();
                 if (ACPI_FAILURE(status)) {
                         toshiba_acpi_exit();