Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Laura Abbott and committed by
Greg Kroah-Hartman
e3b914bc 2f87f50b

-59
-59
drivers/staging/android/ion/ion.c
··· 424 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 427 static void ion_buffer_kmap_put(struct ion_buffer *buffer) 444 428 { 445 429 buffer->kmap_cnt--; ··· 445 461 if (!handle->kmap_cnt) 446 462 ion_buffer_kmap_put(buffer); 447 463 } 448 - 449 - void *ion_map_kernel(struct ion_client *client, struct ion_handle *handle) 450 - { 451 - struct ion_buffer *buffer; 452 - void *vaddr; 453 - 454 - mutex_lock(&client->lock); 455 - if (!ion_handle_validate(client, handle)) { 456 - pr_err("%s: invalid handle passed to map_kernel.\n", 457 - __func__); 458 - mutex_unlock(&client->lock); 459 - return ERR_PTR(-EINVAL); 460 - } 461 - 462 - buffer = handle->buffer; 463 - 464 - if (!handle->buffer->heap->ops->map_kernel) { 465 - pr_err("%s: map_kernel is not implemented by this heap.\n", 466 - __func__); 467 - mutex_unlock(&client->lock); 468 - return ERR_PTR(-ENODEV); 469 - } 470 - 471 - mutex_lock(&buffer->lock); 472 - vaddr = ion_handle_kmap_get(handle); 473 - mutex_unlock(&buffer->lock); 474 - mutex_unlock(&client->lock); 475 - return vaddr; 476 - } 477 - EXPORT_SYMBOL(ion_map_kernel); 478 - 479 - void ion_unmap_kernel(struct ion_client *client, struct ion_handle *handle) 480 - { 481 - struct ion_buffer *buffer; 482 - 483 - mutex_lock(&client->lock); 484 - buffer = handle->buffer; 485 - mutex_lock(&buffer->lock); 486 - ion_handle_kmap_put(handle); 487 - mutex_unlock(&buffer->lock); 488 - mutex_unlock(&client->lock); 489 - } 490 - EXPORT_SYMBOL(ion_unmap_kernel); 491 464 492 465 static struct mutex debugfs_mutex; 493 466 static struct rb_root *ion_root_client;