diff options
-rw-r--r-- | drivers/staging/gasket/gasket_page_table.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c index 5b398b7ba81d..b7d460cf15fb 100644 --- a/drivers/staging/gasket/gasket_page_table.c +++ b/drivers/staging/gasket/gasket_page_table.c | |||
@@ -477,7 +477,6 @@ static int gasket_perform_mapping(struct gasket_page_table *pg_tbl, | |||
477 | for (i = 0; i < num_pages; i++) { | 477 | for (i = 0; i < num_pages; i++) { |
478 | page_addr = host_addr + i * PAGE_SIZE; | 478 | page_addr = host_addr + i * PAGE_SIZE; |
479 | offset = page_addr & (PAGE_SIZE - 1); | 479 | offset = page_addr & (PAGE_SIZE - 1); |
480 | dev_dbg(pg_tbl->device, "%s i %d\n", __func__, i); | ||
481 | if (is_coherent(pg_tbl, host_addr)) { | 480 | if (is_coherent(pg_tbl, host_addr)) { |
482 | u64 off = | 481 | u64 off = |
483 | (u64)host_addr - | 482 | (u64)host_addr - |
@@ -506,22 +505,9 @@ static int gasket_perform_mapping(struct gasket_page_table *pg_tbl, | |||
506 | ptes[i].dma_addr = | 505 | ptes[i].dma_addr = |
507 | dma_map_page(pg_tbl->device, page, 0, PAGE_SIZE, | 506 | dma_map_page(pg_tbl->device, page, 0, PAGE_SIZE, |
508 | DMA_BIDIRECTIONAL); | 507 | DMA_BIDIRECTIONAL); |
509 | dev_dbg(pg_tbl->device, | ||
510 | "%s i %d pte %p pfn %p -> mapped %llx\n", | ||
511 | __func__, i, &ptes[i], | ||
512 | (void *)page_to_pfn(page), | ||
513 | (unsigned long long)ptes[i].dma_addr); | ||
514 | 508 | ||
515 | if (dma_mapping_error(pg_tbl->device, | 509 | if (dma_mapping_error(pg_tbl->device, |
516 | ptes[i].dma_addr)) { | 510 | ptes[i].dma_addr)) { |
517 | dev_dbg(pg_tbl->device, | ||
518 | "%s i %d -> fail to map page %llx " | ||
519 | "[pfn %p ohys %p]\n", | ||
520 | __func__, i, | ||
521 | (unsigned long long)ptes[i].dma_addr, | ||
522 | (void *)page_to_pfn(page), | ||
523 | (void *)page_to_phys(page)); | ||
524 | |||
525 | if (gasket_release_page(ptes[i].page)) | 511 | if (gasket_release_page(ptes[i].page)) |
526 | --pg_tbl->num_active_pages; | 512 | --pg_tbl->num_active_pages; |
527 | 513 | ||
@@ -892,11 +878,6 @@ static int gasket_alloc_extended_subtable(struct gasket_page_table *pg_tbl, | |||
892 | pte->dma_addr = dma_map_page(pg_tbl->device, pte->page, 0, PAGE_SIZE, | 878 | pte->dma_addr = dma_map_page(pg_tbl->device, pte->page, 0, PAGE_SIZE, |
893 | DMA_TO_DEVICE); | 879 | DMA_TO_DEVICE); |
894 | if (dma_mapping_error(pg_tbl->device, pte->dma_addr)) { | 880 | if (dma_mapping_error(pg_tbl->device, pte->dma_addr)) { |
895 | dev_dbg(pg_tbl->device, | ||
896 | "%s: fail to map page [pfn %lx phys %llx]\n", | ||
897 | __func__, page_to_pfn(pte->page), | ||
898 | page_to_phys(pte->page)); | ||
899 | |||
900 | free_page(page_addr); | 881 | free_page(page_addr); |
901 | vfree(pte->sublevel); | 882 | vfree(pte->sublevel); |
902 | memset(pte, 0, sizeof(struct gasket_page_table_entry)); | 883 | memset(pte, 0, sizeof(struct gasket_page_table_entry)); |
@@ -1050,11 +1031,6 @@ int gasket_page_table_map(struct gasket_page_table *pg_tbl, ulong host_addr, | |||
1050 | } | 1031 | } |
1051 | 1032 | ||
1052 | mutex_unlock(&pg_tbl->mutex); | 1033 | mutex_unlock(&pg_tbl->mutex); |
1053 | |||
1054 | dev_dbg(pg_tbl->device, | ||
1055 | "%s done: ha %llx daddr %llx num %d, ret %d\n", | ||
1056 | __func__, (unsigned long long)host_addr, | ||
1057 | (unsigned long long)dev_addr, num_pages, ret); | ||
1058 | return ret; | 1034 | return ret; |
1059 | } | 1035 | } |
1060 | EXPORT_SYMBOL(gasket_page_table_map); | 1036 | EXPORT_SYMBOL(gasket_page_table_map); |