Commit 33cce6e9 authored Sep 12, 2012 by Peter Senna Tschudin Committed by Dave Airlie Oct 02, 2012

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>

parent 3184009c

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1060,7 +1060,7 @@ int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)

		_manager = kzalloc(sizeof(*_manager), GFP_KERNEL);
		if (!_manager)
		goto err_manager;
		goto err;

		mutex_init(&_manager->lock);
		INIT_LIST_HEAD(&_manager->pools);
		@@ -1078,9 +1078,6 @@ int ttm_dma_page_alloc_init(struct ttm_mem_global *glob, unsigned max_pages)
		}
		ttm_dma_pool_mm_shrink_init(_manager);
		return 0;
		err_manager:
		kfree(_manager);
		_manager = NULL;
		err:
		return ret;
		}