From: Lidza Louina <lidza.louina@gmail.com>
Date: Thu, 22 Aug 2013 01:48:41 +0000 (-0400)
Subject: staging: dgap: ifdef HAVE_UNLOCKED_IOCTL conditionals
X-Git-Tag: firefly_0821_release~176^2~5471^2~173
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=acb8d4056a5351748015464b1c551fcd310014ba;p=firefly-linux-kernel-4.4.55.git

staging: dgap: ifdef HAVE_UNLOCKED_IOCTL conditionals

This patch removes the HAVE_UNLOCKED_IOCTL conditional
statements from driver.c, mgmt.c and mgmt.h. This was
used to support older kernels. It isn't needed now.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/dgap/dgap_driver.c b/drivers/staging/dgap/dgap_driver.c
index 987ce21f19ef..0e09ce3c6f36 100644
--- a/drivers/staging/dgap/dgap_driver.c
+++ b/drivers/staging/dgap/dgap_driver.c
@@ -102,11 +102,7 @@ module_exit(dgap_cleanup_module);
 static struct file_operations DgapBoardFops =
 {
 	.owner		=	THIS_MODULE,
-#ifdef HAVE_UNLOCKED_IOCTL
         .unlocked_ioctl = 	dgap_mgmt_ioctl,
-#else
-        .ioctl:      	=	dgap_mgmt_ioctl,
-#endif
 	.open		=	dgap_mgmt_open,
 	.release	=	dgap_mgmt_close
 };
diff --git a/drivers/staging/dgap/dgap_mgmt.c b/drivers/staging/dgap/dgap_mgmt.c
index dce33d4ae604..1ed737542507 100644
--- a/drivers/staging/dgap/dgap_mgmt.c
+++ b/drivers/staging/dgap/dgap_mgmt.c
@@ -152,14 +152,8 @@ int dgap_mgmt_close(struct inode *inode, struct file *file)
  *
  * ioctl the mgmt/dpa device
  */  
-#ifdef HAVE_UNLOCKED_IOCTL
 long dgap_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct inode *inode = file->f_dentry->d_inode;
-#else
-int dgap_mgmt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-{
-#endif
 	unsigned long lock_flags;
 	int error = 0;
 	int i = 0;
diff --git a/drivers/staging/dgap/dgap_mgmt.h b/drivers/staging/dgap/dgap_mgmt.h
index 69e760314db7..4b153f2dd7f2 100644
--- a/drivers/staging/dgap/dgap_mgmt.h
+++ b/drivers/staging/dgap/dgap_mgmt.h
@@ -27,12 +27,7 @@
 
 int dgap_mgmt_open(struct inode *inode, struct file *file);
 int dgap_mgmt_close(struct inode *inode, struct file *file);
-
-#ifdef HAVE_UNLOCKED_IOCTL
 long dgap_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
-#else
-int dgap_mgmt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg);
-#endif
 
 #endif