[02/14] staging: android: ion: Remove empty ion_ioctl_dir() function

Submitted by Andrew F. Davis on Jan. 11, 2019, 6:05 p.m.

Details

Message ID 20190111180523.27862-3-afd@ti.com
State Accepted
Commit 2fbe1707bae2ba9f5f4f5dc96a26797ff3353b1f
Headers show
Series "Misc ION cleanups and adding unmapped heap" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Andrew F. Davis Jan. 11, 2019, 6:05 p.m.
This function is empty of real function and can be replaced with
_IOC_DIR().

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 drivers/staging/android/ion/ion-ioctl.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c
index a8d3cc412fb9..b366f97a5728 100644
--- a/drivers/staging/android/ion/ion-ioctl.c
+++ b/drivers/staging/android/ion/ion-ioctl.c
@@ -31,23 +31,11 @@  static int validate_ioctl_arg(unsigned int cmd, union ion_ioctl_arg *arg)
 	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)
 {
 	int ret = 0;
-	unsigned int dir;
 	union ion_ioctl_arg data;
 
-	dir = ion_ioctl_dir(cmd);
-
 	if (_IOC_SIZE(cmd) > sizeof(data))
 		return -EINVAL;
 
@@ -65,7 +53,7 @@  long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		return ret;
 	}
 
-	if (!(dir & _IOC_WRITE))
+	if (!(_IOC_DIR(cmd) & _IOC_WRITE))
 		memset(&data, 0, sizeof(data));
 
 	switch (cmd) {
@@ -90,7 +78,7 @@  long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		return -ENOTTY;
 	}
 
-	if (dir & _IOC_READ) {
+	if (_IOC_DIR(cmd) & _IOC_READ) {
 		if (copy_to_user((void __user *)arg, &data, _IOC_SIZE(cmd)))
 			return -EFAULT;
 	}