leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: dgnc: removes ifdef HAVE_UNLOCKED_IOCTL conditionals

Browse Source 
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-20 14:15:36 -04:00 committed by Greg Kroah-Hartman
parent f1900e78cf
commit 62a86e50e7
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/dgnc/dgnc_driver.c
View File

@ -99,11 +99,7 @@ module_exit(dgnc_cleanup_module);
static struct file_operations dgnc_BoardFops = static struct file_operations dgnc_BoardFops =
{ {
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = dgnc_mgmt_ioctl, .unlocked_ioctl = dgnc_mgmt_ioctl,
#else
.ioctl = dgnc_mgmt_ioctl,
#endif
.open = dgnc_mgmt_open, .open = dgnc_mgmt_open,
.release = dgnc_mgmt_close .release = dgnc_mgmt_close
}; };

7
drivers/staging/dgnc/dgnc_mgmt.c
View File

@ -125,14 +125,9 @@ int dgnc_mgmt_close(struct inode *inode, struct file *file)
* *
* ioctl the mgmt/dpa device * ioctl the mgmt/dpa device
*/ */
#ifdef HAVE_UNLOCKED_IOCTL
long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 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; unsigned long lock_flags;
void __user *uarg = (void __user *) arg; void __user *uarg = (void __user *) arg;

6
drivers/staging/dgnc/dgnc_mgmt.h
View File

@ -26,12 +26,6 @@
int dgnc_mgmt_open(struct inode *inode, struct file *file); int dgnc_mgmt_open(struct inode *inode, struct file *file);
int dgnc_mgmt_close(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); 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 #endif