Merge remote-tracking branch 'efi/chainsaw' into x86/efi

[firefly-linux-kernel-4.4.55.git] / fs / efivarfs / file.c

diff --git a/fs/efivarfs/file.c b/fs/efivarfs/file.c
index aeb0368dace224e3edf69b89d9b26dffca3014d5..ede07fc7309f8b16ab0a69941d5391d394a27550 100644 (file)
--- a/fs/efivarfs/file.c
+++ b/fs/efivarfs/file.c
@@ -12,12 +12,6 @@
 
 #include "internal.h"
 
-static int efivarfs_file_open(struct inode *inode, struct file *file)
-{
-       file->private_data = inode->i_private;
-       return 0;
-}
-
 static ssize_t efivarfs_file_write(struct file *file,
                const char __user *userbuf, size_t count, loff_t *ppos)
 {
@@ -104,7 +98,7 @@ out_free:
 }
 
 const struct file_operations efivarfs_file_operations = {
-       .open   = efivarfs_file_open,
+       .open   = simple_open,
        .read   = efivarfs_file_read,
        .write  = efivarfs_file_write,
        .llseek = no_llseek,