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

Commit db70331b authored by Laura Abbott's avatar Laura Abbott Committed by Greg Kroah-Hartman
Browse files

staging: android: ion: Remove duplicate ION_IOC_MAP 



ION_IOC_MAP is the same as ION_IOC_SHARE. We really don't need two
identical interfaces. Remove it.

Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c23cbff

drivers/staging/android/ion/compat_ion.c

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ long compat_ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
							(unsigned long)data);

	}

	case ION_IOC_SHARE:

	case ION_IOC_MAP:

		return filp->f_op->unlocked_ioctl(filp, cmd,

						(unsigned long)compat_ptr(arg));

	default:

drivers/staging/android/ion/ion-ioctl.c

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		break;

	}

	case ION_IOC_SHARE:

	case ION_IOC_MAP:

	{

		struct ion_handle *handle;

drivers/staging/android/uapi/ion.h

+0 −10
Original line number Diff line number Diff line
@@ -163,16 +163,6 @@ struct ion_heap_query { 
 */

#define ION_IOC_FREE		_IOWR(ION_IOC_MAGIC, 1, struct ion_handle_data)



/**

 * DOC: ION_IOC_MAP - get a file descriptor to mmap

 *

 * Takes an ion_fd_data struct with the handle field populated with a valid

 * opaque handle.  Returns the struct with the fd field set to a file

 * descriptor open in the current address space.  This file descriptor

 * can then be used as an argument to mmap.

 */

#define ION_IOC_MAP		_IOWR(ION_IOC_MAGIC, 2, struct ion_fd_data)



/**

 * DOC: ION_IOC_SHARE - creates a file descriptor to use to share an allocation

 *