diff --git a/drivers/staging/dgap/dgap_driver.c b/drivers/staging/dgap/dgap_driver.c
index 987ce21f19ef72e047a5bfddd27140e887e9459d..0e09ce3c6f368a6b8b8e02f8b34f43eba20cb7a7 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 dce33d4ae6042b1ca40ff8c85fa89d192220e55a..1ed737542507eec7801a0917a981043ad55e723c 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 69e760314db759bea388927800206e39c204129b..4b153f2dd7f2251b34af2bfd7b5593f4dbac54cf 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