diff options
| author | Lidza Louina <lidza.louina@gmail.com> | 2013-08-22 01:48:41 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-22 17:12:43 (GMT) |
| commit | acb8d4056a5351748015464b1c551fcd310014ba (patch) | |
| tree | d3ccddfab68795878077d7ffb77e237a848f9463 /drivers/staging | |
| parent | 6c2f9ab53ca189aa1829b267dfca1dc3d95252c1 (diff) | |
| download | linux-fsl-qoriq-acb8d4056a5351748015464b1c551fcd310014ba.tar.xz | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/dgap/dgap_driver.c | 4 | ||||
| -rw-r--r-- | drivers/staging/dgap/dgap_mgmt.c | 6 | ||||
| -rw-r--r-- | drivers/staging/dgap/dgap_mgmt.h | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/drivers/staging/dgap/dgap_driver.c b/drivers/staging/dgap/dgap_driver.c index 987ce21f..0e09ce3 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 dce33d4..1ed7375 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 69e7603..4b153f2 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 |