Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1603708

[RFC PATCHv2 11/21] staging: android: ion: Remove duplicate ION_IOC_MAP

Show all headers | View raw

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

Signed-off-by: Laura Abbott <labbott@redhat.com>
---
 drivers/staging/android/ion/compat_ion.c |  1 -
 drivers/staging/android/ion/ion-ioctl.c  |  1 -
 drivers/staging/android/uapi/ion.h       | 10 ----------
 3 files changed, 12 deletions(-)

diff --git a/drivers/staging/android/ion/compat_ion.c b/drivers/staging/android/ion/compat_ion.c
index ae1ffc3..5037ddd 100644
--- a/drivers/staging/android/ion/compat_ion.c
+++ b/drivers/staging/android/ion/compat_ion.c
@@ -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:
diff --git a/drivers/staging/android/ion/ion-ioctl.c b/drivers/staging/android/ion/ion-ioctl.c
index 7b54eea..a361724 100644
--- a/drivers/staging/android/ion/ion-ioctl.c
+++ b/drivers/staging/android/ion/ion-ioctl.c
@@ -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;
 
diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h
index 3a59044..abd72fd 100644
--- a/drivers/staging/android/uapi/ion.h
+++ b/drivers/staging/android/uapi/ion.h
@@ -164,16 +164,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
  *
  * Takes an ion_fd_data struct with the handle field populated with a valid
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RFC PATCHv2 00/21] Ion clean in preparation for moving out of staging Laura Abbott <labbott@redhat.com> - 2017-03-18 02:20 +0100
  [RFC PATCHv2 18/21] staging: android: ion: Rework heap registration/enumeration Laura Abbott <labbott@redhat.com> - 2017-03-18 02:30 +0100
  [RFC PATCHv2 14/21] staging: android: ion: Stop butchering the DMA address Laura Abbott <labbott@redhat.com> - 2017-03-18 02:30 +0100
  [RFC PATCHv2 02/21] cma: Introduce cma_for_each_area Laura Abbott <labbott@redhat.com> - 2017-03-18 02:50 +0100
  [RFC PATCHv2 11/21] staging: android: ion: Remove duplicate ION_IOC_MAP Laura Abbott <labbott@redhat.com> - 2017-03-18 03:10 +0100
  [RFC PATCHv2 20/21] staging: android: ion: Remove ion_handle and ion_client Laura Abbott <labbott@redhat.com> - 2017-03-18 03:10 +0100
  [RFC PATCHv2 07/21] staging: android: ion: Remove page faulting support Laura Abbott <labbott@redhat.com> - 2017-03-18 03:50 +0100
  [RFC PATCHv2 10/21] staging: android: ion: Remove import interface Laura Abbott <labbott@redhat.com> - 2017-03-18 04:00 +0100
  [RFC PATCHv2 03/21] staging: android: ion: Remove dmap_cnt Laura Abbott <labbott@redhat.com> - 2017-03-18 04:00 +0100
  [RFC PATCHv2 15/21] staging: android: ion: Break the ABI in the name of forward progress Laura Abbott <labbott@redhat.com> - 2017-03-18 04:10 +0100
  [RFC PATCHv2 21/21] staging: android: ion: Set query return value Laura Abbott <labbott@redhat.com> - 2017-03-18 04:40 +0100
  [RFC PATCHv2 04/21] staging: android: ion: Remove alignment from allocation field Laura Abbott <labbott@redhat.com> - 2017-03-18 05:00 +0100
  [RFC PATCHv2 06/21] staging: android: ion: Call dma_map_sg for syncing and mapping Laura Abbott <labbott@redhat.com> - 2017-03-18 15:50 +0100

csiph-web