From bb19faa460e8ff511fcc35a4e24713498a920a14 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 8 Dec 2011 09:50:54 +0300 Subject: [PATCH] --- yaml --- r: 282744 b: refs/heads/master c: 7920aa5a9d841fc7a10ff53a5a775f821d7a6ba1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7bca5bc90f53..e080c3f2fbd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7eef882a8d37be46459faa5020648af7ccf6ad2 +refs/heads/master: 7920aa5a9d841fc7a10ff53a5a775f821d7a6ba1 diff --git a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 156ddcd304c3..37ead6995c87 100644 --- a/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/trunk/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -933,10 +933,8 @@ static int ttm_dma_pool_get_num_unused_pages(void) unsigned total = 0; mutex_lock(&_manager->lock); - list_for_each_entry(p, &_manager->pools, pools) { - if (p) - total += p->pool->npages_free; - } + list_for_each_entry(p, &_manager->pools, pools) + total += p->pool->npages_free; mutex_unlock(&_manager->lock); return total; } @@ -1031,7 +1029,7 @@ static int ttm_dma_pool_mm_shrink(struct shrinker *shrink, list_for_each_entry(p, &_manager->pools, pools) { unsigned nr_free; - if (!p && !p->dev) + if (!p->dev) continue; if (shrink_pages == 0) break;