Browse Source

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>
Lidza Louina 12 years ago
parent
commit
acb8d4056a

+ 0 - 4
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
 };

+ 0 - 6
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;

+ 0 - 5
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