4 files changed, 12 insertions, 8 deletions

diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
index 78d681dc35a8..f5212eb2b41d 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
@@ -95,11 +95,11 @@ static int __devexit hvc_vio_remove(struct vio_dev *vdev)
 }
 
 static struct vio_driver hvc_vio_driver = {
-        .name           = hvc_driver_name,
         .id_table       = hvc_driver_table,
         .probe          = hvc_vio_probe,
         .remove         = hvc_vio_remove,
         .driver         = {
+                .name   = hvc_driver_name,
                 .owner  = THIS_MODULE,
         }
 };
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index f47f009f9259..53dc77c760fc 100644
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -720,10 +720,13 @@ static int __devexit hvcs_remove(struct vio_dev *dev)
 };
 
 static struct vio_driver hvcs_vio_driver = {
-        .name           = hvcs_driver_name,
         .id_table       = hvcs_driver_table,
         .probe          = hvcs_probe,
         .remove         = hvcs_remove,
+        .driver         = {
+                .name   = hvcs_driver_name,
+                .owner  = THIS_MODULE,
+        }
 };
 
 /* Only called from hvcs_get_pi please */
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 38be4b0dbd1c..91dd669273e0 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -231,9 +231,7 @@ static ssize_t write_mem(struct file * file, const char __user * buf,
 static int mmap_mem(struct file * file, struct vm_area_struct * vma)
 {
 #if defined(__HAVE_PHYS_MEM_ACCESS_PROT)
-        unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
-
-        vma->vm_page_prot = phys_mem_access_prot(file, offset,
+        vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff,
                                                  vma->vm_end - vma->vm_start,
                                                  vma->vm_page_prot);
 #elif defined(pgprot_noncached)
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index a5e104f428f8..51abd3defc1c 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -993,13 +993,16 @@ static struct vio_device_id viotape_device_table[] __devinitdata = {
         { "viotape", "" },
         { "", "" }
 };
-
 MODULE_DEVICE_TABLE(vio, viotape_device_table);
+
 static struct vio_driver viotape_driver = {
-        .name = "viotape",
         .id_table = viotape_device_table,
         .probe = viotape_probe,
-        .remove = viotape_remove
+        .remove = viotape_remove,
+        .driver = {
+                .name = "viotape",
+                .owner = THIS_MODULE,
+        }
 };