aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2012-09-12 11:06:41 -0400
committerDave Airlie <airlied@redhat.com>2012-10-01 19:33:26 -0400
commit33cce6e9801f7d0184a636e9096a7cf7f8237ff9 (patch)
treeb278feda67010def1d090e4b4b0f14770b4dce3d
parent3184009c36da413724f283e3c7ac9cc60c623bc4 (diff)
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c: Remove useless kfree
Remove useless kfree() and clean up code related to the removal. The semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ position p1,p2; expression x; @@ if (x@p1 == NULL) { ... kfree@p2(x); ... return ...; } @unchanged exists@ position r.p1,r.p2; expression e <= r.x,x,e1; iterator I; statement S; @@ if (x@p1 == NULL) { ... when != I(x,...) S when != e = e1 when != e += e1 when != e -= e1 when != ++e when != --e when != e++ when != e-- when != &e kfree@p2(x); ... return ...; } @ok depends on unchanged exists@ position any r.p1; position r.p2; expression x; @@ ... when != true x@p1 == NULL kfree@p2(x); @depends on !ok && unchanged@ position r.p2; expression x; @@ *kfree@p2(x); // </smpl> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/ttm/ttm_page_alloc_dma.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index 4f9e548b2eec..969d76532088 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -1060,7 +1060,7 @@ int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
1060 1060
1061 _manager = kzalloc(sizeof(*_manager), GFP_KERNEL); 1061 _manager = kzalloc(sizeof(*_manager), GFP_KERNEL);
1062 if (!_manager) 1062 if (!_manager)
1063 goto err_manager; 1063 goto err;
1064 1064
1065 mutex_init(&_manager->lock); 1065 mutex_init(&_manager->lock);
1066 INIT_LIST_HEAD(&_manager->pools); 1066 INIT_LIST_HEAD(&_manager->pools);
@@ -1078,9 +1078,6 @@ int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
1078 } 1078 }
1079 ttm_dma_pool_mm_shrink_init(_manager); 1079 ttm_dma_pool_mm_shrink_init(_manager);
1080 return 0; 1080 return 0;
1081err_manager:
1082 kfree(_manager);
1083 _manager = NULL;
1084err: 1081err:
1085 return ret; 1082 return ret;
1086} 1083}