From: Lidza Louina <lidza.louina@gmail.com>
Date: Tue, 20 Aug 2013 18:15:36 +0000 (-0400)
Subject: staging: dgnc: removes ifdef HAVE_UNLOCKED_IOCTL conditionals
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=62a86e50e73f60300f51e30a62ba04a76888b4da;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

staging: dgnc: removes 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/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
index e5d021f8bd96..937134749e3e 100644
--- a/drivers/staging/dgnc/dgnc_driver.c
+++ b/drivers/staging/dgnc/dgnc_driver.c
@@ -99,11 +99,7 @@ module_exit(dgnc_cleanup_module);
 static struct file_operations dgnc_BoardFops =
 {
 	.owner		=	THIS_MODULE,
-#ifdef HAVE_UNLOCKED_IOCTL
         .unlocked_ioctl =  	dgnc_mgmt_ioctl,
-#else
-        .ioctl          =       dgnc_mgmt_ioctl,
-#endif
 	.open		=	dgnc_mgmt_open,
 	.release	=	dgnc_mgmt_close
 };
diff --git a/drivers/staging/dgnc/dgnc_mgmt.c b/drivers/staging/dgnc/dgnc_mgmt.c
index bbd65db524cd..200da36caa78 100644
--- a/drivers/staging/dgnc/dgnc_mgmt.c
+++ b/drivers/staging/dgnc/dgnc_mgmt.c
@@ -125,14 +125,9 @@ int dgnc_mgmt_close(struct inode *inode, struct file *file)
  *
  * ioctl the mgmt/dpa device
  */  
-#ifdef HAVE_UNLOCKED_IOCTL
+
 long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-	struct inode *inode = file->f_dentry->d_inode;
-#else        
-int dgnc_mgmt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-{
-#endif
 	unsigned long lock_flags;
 	void __user *uarg = (void __user *) arg;
 
diff --git a/drivers/staging/dgnc/dgnc_mgmt.h b/drivers/staging/dgnc/dgnc_mgmt.h
index a0d1338ee545..567f687b18dd 100644
--- a/drivers/staging/dgnc/dgnc_mgmt.h
+++ b/drivers/staging/dgnc/dgnc_mgmt.h
@@ -26,12 +26,6 @@
 
 int dgnc_mgmt_open(struct inode *inode, struct file *file);
 int dgnc_mgmt_close(struct inode *inode, struct file *file);
-
-#ifdef HAVE_UNLOCKED_IOCTL
 long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
-#else
-int dgnc_mgmt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg);
-#endif
-
 #endif