Merge branch 'linus' into x86/cleanups

1 files changed, 0 insertions, 12 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index afe1de998763..a454f94623d7 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -2988,17 +2988,6 @@ static int megasas_mgmt_open(struct inode *inode, struct file *filep)
 }
 
 /**
- * megasas_mgmt_release - char node "release" entry point
- */
-static int megasas_mgmt_release(struct inode *inode, struct file *filep)
-{
-        filep->private_data = NULL;
-        fasync_helper(-1, filep, 0, &megasas_async_queue);
-
-        return 0;
-}
-
-/**
  * megasas_mgmt_fasync -        Async notifier registration from applications
  *
  * This function adds the calling process to a driver global queue. When an
@@ -3345,7 +3334,6 @@ megasas_mgmt_compat_ioctl(struct file *file, unsigned int cmd,
 static const struct file_operations megasas_mgmt_fops = {
         .owner = THIS_MODULE,
         .open = megasas_mgmt_open,
-        .release = megasas_mgmt_release,
         .fasync = megasas_mgmt_fasync,
         .unlocked_ioctl = megasas_mgmt_ioctl,
 #ifdef CONFIG_COMPAT