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

staging: dgnc: removes 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 f1900e78

drivers/staging/dgnc/dgnc_driver.c

+0 −4
Original line number Diff line number Diff line
@@ -99,11 +99,7 @@ module_exit(dgnc_cleanup_module); 
static struct file_operations dgnc_BoardFops =

{

	.owner		=	THIS_MODULE,

#ifdef HAVE_UNLOCKED_IOCTL

        .unlocked_ioctl =  	dgnc_mgmt_ioctl,

#else

        .ioctl          =       dgnc_mgmt_ioctl,

#endif

	.open		=	dgnc_mgmt_open,

	.release	=	dgnc_mgmt_close

};

drivers/staging/dgnc/dgnc_mgmt.c

+1 −6
Original line number Diff line number Diff line
@@ -125,14 +125,9 @@ int dgnc_mgmt_close(struct inode *inode, struct file *file) 
 *

 * ioctl the mgmt/dpa device

 */  

#ifdef HAVE_UNLOCKED_IOCTL



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;

	void __user *uarg = (void __user *) arg;

drivers/staging/dgnc/dgnc_mgmt.h

+0 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ 


int dgnc_mgmt_open(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);

#else

int dgnc_mgmt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg);

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE