openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Lidza Louina 2013-08-21 21:48:41 -04:00 committed by Greg Kroah-Hartman
parent 6c2f9ab53c
commit acb8d4056a
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/dgap/dgap_driver.c
View File

@ -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
};

6
drivers/staging/dgap/dgap_mgmt.c
View File

@ -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;

5
drivers/staging/dgap/dgap_mgmt.h
View File

@ -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