Commit 9982937a authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: get rid of HAVE_UNLOCKED_IOCTL code

We definitely have it, so there's no point in keeping the older stuff
around. Get rid of the #ifdefs and old code.
Signed-off-by: default avatarKen Depro <kenneth.depro@unisys.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e8fe1ef1
...@@ -36,23 +36,14 @@ static BOOL registered = FALSE; ...@@ -36,23 +36,14 @@ static BOOL registered = FALSE;
static int visorchipset_open(struct inode *inode, struct file *file); static int visorchipset_open(struct inode *inode, struct file *file);
static int visorchipset_release(struct inode *inode, struct file *file); static int visorchipset_release(struct inode *inode, struct file *file);
static int visorchipset_mmap(struct file *file, struct vm_area_struct *vma); static int visorchipset_mmap(struct file *file, struct vm_area_struct *vma);
#ifdef HAVE_UNLOCKED_IOCTL
long visorchipset_ioctl(struct file *file, unsigned int cmd, unsigned long arg); long visorchipset_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
#else
int visorchipset_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg);
#endif
static const struct file_operations visorchipset_fops = { static const struct file_operations visorchipset_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = visorchipset_open, .open = visorchipset_open,
.read = NULL, .read = NULL,
.write = NULL, .write = NULL,
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = visorchipset_ioctl, .unlocked_ioctl = visorchipset_ioctl,
#else
.ioctl = visorchipset_ioctl,
#endif
.release = visorchipset_release, .release = visorchipset_release,
.mmap = visorchipset_mmap, .mmap = visorchipset_mmap,
}; };
...@@ -178,14 +169,7 @@ visorchipset_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -178,14 +169,7 @@ visorchipset_mmap(struct file *file, struct vm_area_struct *vma)
return 0; return 0;
} }
#ifdef HAVE_UNLOCKED_IOCTL long visorchipset_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
long
visorchipset_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
#else
int
visorchipset_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
#endif
{ {
int rc = SUCCESS; int rc = SUCCESS;
s64 adjustment; s64 adjustment;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment