Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acb8d405 authored by Lidza Louina's avatar Lidza Louina Committed by Greg Kroah-Hartman
Browse files

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: default avatarLidza Louina <lidza.louina@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c2f9ab5

drivers/staging/dgap/dgap_driver.c

+0 −4
Original line number Diff line number Diff line
@@ -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

};

drivers/staging/dgap/dgap_mgmt.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

drivers/staging/dgap/dgap_mgmt.h

+0 −5
Original line number Diff line number Diff line
@@ -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