diff options
| author |   Lidza Louina <lidza.louina@gmail.com> | 2013-08-20 14:15:36 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-20 16:28:40 -0700 |
| commit | 62a86e50e73f60300f51e30a62ba04a76888b4da (patch) | |
| tree | cb9d66af7f0ff622c77d176c321c99e16f64209e /drivers/staging/dgnc | |
| parent | staging: dgnc: driver.c: fixes warning about assigning pointer (diff) | |
| download | linux-dev-62a86e50e73f60300f51e30a62ba04a76888b4da.tar.xz linux-dev-62a86e50e73f60300f51e30a62ba04a76888b4da.zip | |
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>
Diffstat (limited to 'drivers/staging/dgnc')
| -rw-r--r-- | drivers/staging/dgnc/dgnc_driver.c | 4 | ||||
| -rw-r--r-- | drivers/staging/dgnc/dgnc_mgmt.c | 7 | ||||
| -rw-r--r-- | drivers/staging/dgnc/dgnc_mgmt.h | 6 |
3 files changed, 1 insertions, 16 deletions
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 |