openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm: simplify master cleanup 

In drm_master_destroy() we _free_ the master object. There is no reason to
hold any locks while dropping its static members, nor do we have to reset
it to 0.

Furthermore, kfree() already does NULL checks, so call it directly on
master->unique and drop the redundant reset-code.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
David Herrmann 2015-05-04 16:05:14 +02:00 committed by Daniel Vetter
parent 32e7b94a3f
commit 4a324d33bf
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/drm_drv.c
View File

@ -132,15 +132,10 @@ static void drm_master_destroy(struct kref *kref)
r_list = NULL; r_list = NULL;
} }
} }
if (master->unique) {
kfree(master->unique);
master->unique = NULL;
master->unique_len = 0;
}
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
idr_destroy(&master->magic_map); idr_destroy(&master->magic_map);
kfree(master->unique);
kfree(master); kfree(master);
} }