summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/nvmap/nvmap_heap.c
diff options
context:
space:
mode:
authorKen Adams <kadams@nvidia.com>2011-09-26 11:02:09 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:49:03 -0800
commitc6b3eddba4aa0685a0a0576219622b9a2c0c4d74 (patch)
tree877daa4b9b921df56c4dd378e342d41078a7fe64 /drivers/video/tegra/nvmap/nvmap_heap.c
parent39641b246a500ac3ad735325e9b0206264c02931 (diff)
video: tegra: nvmap: fix checkpatch.pl issues
Change-Id: Ic7fab1575312afd27430b46a50aa6f7a7de0ac4e Reviewed-on: http://git-master/r/53843 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Rebase-Id: R44abb981f52475b4431975c5d38611e7ca93b59a
Diffstat (limited to 'drivers/video/tegra/nvmap/nvmap_heap.c')
-rw-r--r--drivers/video/tegra/nvmap/nvmap_heap.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_heap.c b/drivers/video/tegra/nvmap/nvmap_heap.c
index 1378a5cb1f79..7474f31534ff 100644
--- a/drivers/video/tegra/nvmap/nvmap_heap.c
+++ b/drivers/video/tegra/nvmap/nvmap_heap.c
@@ -424,9 +424,8 @@ static struct nvmap_heap_block *do_heap_alloc(struct nvmap_heap *heap,
/* needed for compaction. relocated chunk
* should never go up */
- if (base_max && fix_base > base_max) {
+ if (base_max && fix_base > base_max)
break;
- }
if (fix_size >= len) {
b = i;
@@ -510,7 +509,7 @@ static void freelist_debug(struct nvmap_heap *heap, const char *title,
dev_debug(&heap->dev, "%s\n", title);
i = 0;
list_for_each_entry(n, &heap->free_list, free_list) {
- dev_debug(&heap->dev,"\t%d [%p..%p]%s\n", i, (void *)n->orig_addr,
+ dev_debug(&heap->dev, "\t%d [%p..%p]%s\n", i, (void *)n->orig_addr,
(void *)(n->orig_addr + n->size),
(n == token) ? "<--" : "");
i++;
@@ -901,9 +900,6 @@ struct nvmap_heap *nvmap_block_to_heap(struct nvmap_heap_block *b)
}
}
-int nvmap_flush_heap_block(struct nvmap_client *client,
- struct nvmap_heap_block *block, size_t len, unsigned int prot);
-
/* nvmap_heap_free: frees block b*/
void nvmap_heap_free(struct nvmap_heap_block *b)
{