Commit 2fbe1707 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Greg Kroah-Hartman

staging: android: ion: Remove empty ion_ioctl_dir() function

This function is empty of real function and can be replaced with
_IOC_DIR().
Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 32462a98
...@@ -31,23 +31,11 @@ static int validate_ioctl_arg(unsigned int cmd, union ion_ioctl_arg *arg) ...@@ -31,23 +31,11 @@ static int validate_ioctl_arg(unsigned int cmd, union ion_ioctl_arg *arg)
return 0; return 0;
} }
/* fix up the cases where the ioctl direction bits are incorrect */
static unsigned int ion_ioctl_dir(unsigned int cmd)
{
switch (cmd) {
default:
return _IOC_DIR(cmd);
}
}
long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{ {
int ret = 0; int ret = 0;
unsigned int dir;
union ion_ioctl_arg data; union ion_ioctl_arg data;
dir = ion_ioctl_dir(cmd);
if (_IOC_SIZE(cmd) > sizeof(data)) if (_IOC_SIZE(cmd) > sizeof(data))
return -EINVAL; return -EINVAL;
...@@ -65,7 +53,7 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -65,7 +53,7 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return ret; return ret;
} }
if (!(dir & _IOC_WRITE)) if (!(_IOC_DIR(cmd) & _IOC_WRITE))
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
switch (cmd) { switch (cmd) {
...@@ -90,7 +78,7 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ...@@ -90,7 +78,7 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
return -ENOTTY; return -ENOTTY;
} }
if (dir & _IOC_READ) { if (_IOC_DIR(cmd) & _IOC_READ) {
if (copy_to_user((void __user *)arg, &data, _IOC_SIZE(cmd))) if (copy_to_user((void __user *)arg, &data, _IOC_SIZE(cmd)))
return -EFAULT; return -EFAULT;
} }
......
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