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

Groups > linux.kernel > #1615492

[PATCHv3 19/22] staging: android: ion: Drop ion_map_kernel interface

Show all headers | View raw

Nobody uses this interface externally. Drop it.

Signed-off-by: Laura Abbott <labbott@redhat.com>
---
 drivers/staging/android/ion/ion.c | 59 ---------------------------------------
 1 file changed, 59 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 7d40233..5a82bea 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -424,22 +424,6 @@ static void *ion_buffer_kmap_get(struct ion_buffer *buffer)
 	return vaddr;
 }
 
-static void *ion_handle_kmap_get(struct ion_handle *handle)
-{
-	struct ion_buffer *buffer = handle->buffer;
-	void *vaddr;
-
-	if (handle->kmap_cnt) {
-		handle->kmap_cnt++;
-		return buffer->vaddr;
-	}
-	vaddr = ion_buffer_kmap_get(buffer);
-	if (IS_ERR(vaddr))
-		return vaddr;
-	handle->kmap_cnt++;
-	return vaddr;
-}
-
 static void ion_buffer_kmap_put(struct ion_buffer *buffer)
 {
 	buffer->kmap_cnt--;
@@ -462,49 +446,6 @@ static void ion_handle_kmap_put(struct ion_handle *handle)
 		ion_buffer_kmap_put(buffer);
 }
 
-void *ion_map_kernel(struct ion_client *client, struct ion_handle *handle)
-{
-	struct ion_buffer *buffer;
-	void *vaddr;
-
-	mutex_lock(&client->lock);
-	if (!ion_handle_validate(client, handle)) {
-		pr_err("%s: invalid handle passed to map_kernel.\n",
-		       __func__);
-		mutex_unlock(&client->lock);
-		return ERR_PTR(-EINVAL);
-	}
-
-	buffer = handle->buffer;
-
-	if (!handle->buffer->heap->ops->map_kernel) {
-		pr_err("%s: map_kernel is not implemented by this heap.\n",
-		       __func__);
-		mutex_unlock(&client->lock);
-		return ERR_PTR(-ENODEV);
-	}
-
-	mutex_lock(&buffer->lock);
-	vaddr = ion_handle_kmap_get(handle);
-	mutex_unlock(&buffer->lock);
-	mutex_unlock(&client->lock);
-	return vaddr;
-}
-EXPORT_SYMBOL(ion_map_kernel);
-
-void ion_unmap_kernel(struct ion_client *client, struct ion_handle *handle)
-{
-	struct ion_buffer *buffer;
-
-	mutex_lock(&client->lock);
-	buffer = handle->buffer;
-	mutex_lock(&buffer->lock);
-	ion_handle_kmap_put(handle);
-	mutex_unlock(&buffer->lock);
-	mutex_unlock(&client->lock);
-}
-EXPORT_SYMBOL(ion_unmap_kernel);
-
 static struct mutex debugfs_mutex;
 static struct rb_root *ion_root_client;
 static int is_client_alive(struct ion_client *client)
-- 
2.7.4

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

Thread

[PATCHv3 00/22] Ion clean up in preparation in moving out of staging Laura Abbott <labbott@redhat.com> - 2017-04-03 21:00 +0200
  [PATCHv3 15/22] staging: android: ion: Break the ABI in the name of forward progress Laura Abbott <labbott@redhat.com> - 2017-04-03 21:00 +0200
  [PATCHv3 07/22] staging: android: ion: Remove page faulting support Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 19/22] staging: android: ion: Drop ion_map_kernel interface Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 14/22] staging: android: ion: Stop butchering the DMA address Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 18/22] staging: android: ion: Rework heap registration/enumeration Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 06/22] staging: android: ion: Call dma_map_sg for syncing and mapping Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 05/22] staging: android: ion: Duplicate sg_table Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 11/22] staging: android: ion: Remove duplicate ION_IOC_MAP Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 22/22] staging/android: Update Ion TODO list Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 04/22] staging: android: ion: Remove alignment from allocation field Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 21/22] staging: android: ion: Set query return value Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 09/22] staging: android: ion: Remove custom ioctl interface Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  Re: [PATCHv3 00/22] Ion clean up in preparation in moving out of  staging Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-08 12:40 +0200
  Re: [PATCHv3 17/22] staging: android: ion: Collapse internal header files Emil Velikov <emil.l.velikov@gmail.com> - 2017-04-08 20:20 +0200

csiph-web