diff options
author | Laura Abbott <labbott@redhat.com> | 2017-04-18 14:27:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 14:43:14 -0400 |
commit | e3b914bc7eb6bcecc5b597ee6e31fc40442c291f (patch) | |
tree | 453f09c0078d9f5f6c2555ddac438c3b17ed4f4c | |
parent | 2f87f50b234038ff91f67b4a98f2289ff630563a (diff) |
staging: android: ion: Drop ion_map_kernel interface
Nobody uses this interface externally. Drop it.
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/android/ion/ion.c | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index 7d402334a546..5a82beaa65bb 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) | |||
424 | return vaddr; | 424 | return vaddr; |
425 | } | 425 | } |
426 | 426 | ||
427 | static void *ion_handle_kmap_get(struct ion_handle *handle) | ||
428 | { | ||
429 | struct ion_buffer *buffer = handle->buffer; | ||
430 | void *vaddr; | ||
431 | |||
432 | if (handle->kmap_cnt) { | ||
433 | handle->kmap_cnt++; | ||
434 | return buffer->vaddr; | ||
435 | } | ||
436 | vaddr = ion_buffer_kmap_get(buffer); | ||
437 | if (IS_ERR(vaddr)) | ||
438 | return vaddr; | ||
439 | handle->kmap_cnt++; | ||
440 | return vaddr; | ||
441 | } | ||
442 | |||
443 | static void ion_buffer_kmap_put(struct ion_buffer *buffer) | 427 | static void ion_buffer_kmap_put(struct ion_buffer *buffer) |
444 | { | 428 | { |
445 | buffer->kmap_cnt--; | 429 | buffer->kmap_cnt--; |
@@ -462,49 +446,6 @@ static void ion_handle_kmap_put(struct ion_handle *handle) | |||
462 | ion_buffer_kmap_put(buffer); | 446 | ion_buffer_kmap_put(buffer); |
463 | } | 447 | } |
464 | 448 | ||
465 | void *ion_map_kernel(struct ion_client *client, struct ion_handle *handle) | ||
466 | { | ||
467 | struct ion_buffer *buffer; | ||
468 | void *vaddr; | ||
469 | |||
470 | mutex_lock(&client->lock); | ||
471 | if (!ion_handle_validate(client, handle)) { | ||
472 | pr_err("%s: invalid handle passed to map_kernel.\n", | ||
473 | __func__); | ||
474 | mutex_unlock(&client->lock); | ||
475 | return ERR_PTR(-EINVAL); | ||
476 | } | ||
477 | |||
478 | buffer = handle->buffer; | ||
479 | |||
480 | if (!handle->buffer->heap->ops->map_kernel) { | ||
481 | pr_err("%s: map_kernel is not implemented by this heap.\n", | ||
482 | __func__); | ||
483 | mutex_unlock(&client->lock); | ||
484 | return ERR_PTR(-ENODEV); | ||
485 | } | ||
486 | |||
487 | mutex_lock(&buffer->lock); | ||
488 | vaddr = ion_handle_kmap_get(handle); | ||
489 | mutex_unlock(&buffer->lock); | ||
490 | mutex_unlock(&client->lock); | ||
491 | return vaddr; | ||
492 | } | ||
493 | EXPORT_SYMBOL(ion_map_kernel); | ||
494 | |||
495 | void ion_unmap_kernel(struct ion_client *client, struct ion_handle *handle) | ||
496 | { | ||
497 | struct ion_buffer *buffer; | ||
498 | |||
499 | mutex_lock(&client->lock); | ||
500 | buffer = handle->buffer; | ||
501 | mutex_lock(&buffer->lock); | ||
502 | ion_handle_kmap_put(handle); | ||
503 | mutex_unlock(&buffer->lock); | ||
504 | mutex_unlock(&client->lock); | ||
505 | } | ||
506 | EXPORT_SYMBOL(ion_unmap_kernel); | ||
507 | |||
508 | static struct mutex debugfs_mutex; | 449 | static struct mutex debugfs_mutex; |
509 | static struct rb_root *ion_root_client; | 450 | static struct rb_root *ion_root_client; |
510 | static int is_client_alive(struct ion_client *client) | 451 | static int is_client_alive(struct ion_client *client) |