From 62a86e50e73f60300f51e30a62ba04a76888b4da Mon Sep 17 00:00:00 2001 From: Lidza Louina Date: Tue, 20 Aug 2013 14:15:36 -0400 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/dgnc/dgnc_driver.c | 4 ---- drivers/staging/dgnc/dgnc_mgmt.c | 7 +------ drivers/staging/dgnc/dgnc_mgmt.h | 6 ------ 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c index e5d021f..9371347 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 bbd65db..200da36 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 a0d1338..567f687 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 -- 2.7.4