1 files changed, 14 insertions, 36 deletions

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 579868af4a54..89b718e326e5 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -238,39 +238,14 @@ out:
         return err;
 }
 
-static ssize_t raw_file_write(struct file *file, const char __user *buf,
-                                   size_t count, loff_t *ppos)
-{
-        struct iovec local_iov = {
-                .iov_base = (char __user *)buf,
-                .iov_len = count
-        };
-
-        return generic_file_write_nolock(file, &local_iov, 1, ppos);
-}
-
-static ssize_t raw_file_aio_write(struct kiocb *iocb, const char __user *buf,
-                                        size_t count, loff_t pos)
-{
-        struct iovec local_iov = {
-                .iov_base = (char __user *)buf,
-                .iov_len = count
-        };
-
-        return generic_file_aio_write_nolock(iocb, &local_iov, 1, &iocb->ki_pos);
-}
-
-
 static const struct file_operations raw_fops = {
-        .read   =       generic_file_read,
+        .read   =       do_sync_read,
         .aio_read =     generic_file_aio_read,
-        .write  =       raw_file_write,
-        .aio_write =    raw_file_aio_write,
+        .write  =       do_sync_write,
+        .aio_write =    generic_file_aio_write_nolock,
         .open   =       raw_open,
         .release=       raw_release,
         .ioctl  =       raw_ioctl,
-        .readv  =       generic_file_readv,
-        .writev =       generic_file_writev,
         .owner  =       THIS_MODULE,
 };
 
@@ -288,31 +263,34 @@ static struct cdev raw_cdev = {
 static int __init raw_init(void)
 {
         dev_t dev = MKDEV(RAW_MAJOR, 0);
+        int ret;
 
-        if (register_chrdev_region(dev, MAX_RAW_MINORS, "raw"))
+        ret = register_chrdev_region(dev, MAX_RAW_MINORS, "raw");
+        if (ret)
                 goto error;
 
         cdev_init(&raw_cdev, &raw_fops);
-        if (cdev_add(&raw_cdev, dev, MAX_RAW_MINORS)) {
+        ret = cdev_add(&raw_cdev, dev, MAX_RAW_MINORS);
+        if (ret) {
                 kobject_put(&raw_cdev.kobj);
-                unregister_chrdev_region(dev, MAX_RAW_MINORS);
-                goto error;
+                goto error_region;
         }
 
         raw_class = class_create(THIS_MODULE, "raw");
         if (IS_ERR(raw_class)) {
                 printk(KERN_ERR "Error creating raw class.\n");
                 cdev_del(&raw_cdev);
-                unregister_chrdev_region(dev, MAX_RAW_MINORS);
-                goto error;
+                ret = PTR_ERR(raw_class);
+                goto error_region;
         }
         class_device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
 
         return 0;
 
+error_region:
+        unregister_chrdev_region(dev, MAX_RAW_MINORS);
 error:
-        printk(KERN_ERR "error register raw device\n");
-        return 1;
+        return ret;
 }
 
 static void __exit raw_exit(void)