UPSTREAM: clk: rockchip: rk3036: fix the FLAGs for clock mux

[firefly-linux-kernel-4.4.55.git] / drivers / char / raw.c

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index f3223aac4df11c41959a744bee67af2d2df232e5..60316fbaf2957d1bbbee14c67072920170954170 100644 (file)
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -12,6 +12,7 @@
 #include <linux/fs.h>
 #include <linux/major.h>
 #include <linux/blkdev.h>
+#include <linux/backing-dev.h>
 #include <linux/module.h>
 #include <linux/raw.h>
 #include <linux/capability.h>
@@ -104,11 +105,9 @@ static int raw_release(struct inode *inode, struct file *filp)
 
        mutex_lock(&raw_mutex);
        bdev = raw_devices[minor].binding;
-       if (--raw_devices[minor].inuse == 0) {
+       if (--raw_devices[minor].inuse == 0)
                /* Here  inode->i_mapping == bdev->bd_inode->i_mapping  */
                inode->i_mapping = &inode->i_data;
-               inode->i_mapping->backing_dev_info = &default_backing_dev_info;
-       }
        mutex_unlock(&raw_mutex);
 
        blkdev_put(bdev, filp->f_mode | FMODE_EXCL);
@@ -190,7 +189,7 @@ static int bind_get(int number, dev_t *dev)
        struct raw_device_data *rawdev;
        struct block_device *bdev;
 
-       if (number <= 0 || number >= MAX_RAW_MINORS)
+       if (number <= 0 || number >= max_raw_minors)
                return -EINVAL;
 
        rawdev = &raw_devices[number];
@@ -284,10 +283,8 @@ static long raw_ctl_compat_ioctl(struct file *file, unsigned int cmd,
 #endif
 
 static const struct file_operations raw_fops = {
-       .read           = do_sync_read,
-       .aio_read       = generic_file_aio_read,
-       .write          = do_sync_write,
-       .aio_write      = blkdev_aio_write,
+       .read_iter      = blkdev_read_iter,
+       .write_iter     = blkdev_write_iter,
        .fsync          = blkdev_fsync,
        .open           = raw_open,
        .release        = raw_release,