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 e5d021f8bd9612ceb64c5d98efb102cff7ba1758..937134749e3e4e09557ec7b131f3fa5d8aa278f9 100644 (file)
--- 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 bbd65db524cd1068fea76795c1f089d6e7d0b334..200da36caa781c9dfa05fa8e07906e6aeec9f302 100644 (file)
--- 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 a0d1338ee54577ae9ab41d6ebb52382439a5b3cb..567f687b18ddb79bc0dae4124be9f6f1ede2f46f 100644 (file)
--- 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