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@xxxxxxxxx>
---
drivers/staging/dgap/dgap_driver.c | 4 ----
drivers/staging/dgap/dgap_mgmt.c | 6 ------
drivers/staging/dgap/dgap_mgmt.h | 5 -----
3 files changed, 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
--
1.8.1.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
