DRM DRIVERS: "kobject_init/kobject_add" -> "kobject_init_and_add".
Subsystems (3)
PATCH 1/1 DRM DRIVERS: "kobject_init/kobject_add" -> "kobject_init_and_add".
Replace sequential calls to kobject_init() and kobject_add() with the combo wrapper kobject_init_and_add(), which provides the same semantics.
---
in the midst of some kobject cleanup, and there should be a minimum
of routines that call kobject_init() directly if all they're doing is immediately adding.
the line formatting below is questionable so tweak however you
please.
*not* compile tested since it's pretty much a syntactical change.
drivers/gpu/drm/ttm/ttm_bo.c +2 -2
@@ -1425,8 +1425,8 @@ int ttm_bo_global_init(struct ttm_global_reference *ref)atomic_set (&glob->bo_count,0 ); -kobject_init (&glob->kobj, &ttm_bo_glob_kobj_type); - ret =kobject_add (&glob->kobj,ttm_get_kobj (),"buffer_objects" ); + ret =kobject_init_and_add ( + &glob->kobj, &ttm_bo_glob_kobj_type,ttm_get_kobj (),"buffer_objects" );if (unlikely (ret !=0 ))kobject_put (&glob->kobj);return ret;
drivers/gpu/drm/ttm/ttm_memory.c +8 -10
@@ -260,8 +260,8 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob, zone->used_mem =0 ; zone->glob = glob; glob->zone_kernel = zone; -kobject_init (&zone->kobj, &ttm_mem_zone_kobj_type); - ret =kobject_add (&zone->kobj, &glob->kobj, zone->name); + ret =kobject_init_and_add ( + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);if (unlikely (ret !=0 )) {kobject_put (&zone->kobj);return ret;
@@ -296,8 +296,8 @@ static int ttm_mem_init_highmem_zone(struct ttm_mem_global *glob, zone->used_mem =0 ; zone->glob = glob; glob->zone_highmem = zone; -kobject_init (&zone->kobj, &ttm_mem_zone_kobj_type); - ret =kobject_add (&zone->kobj, &glob->kobj, zone->name); + ret =kobject_init_and_add ( + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);if (unlikely (ret !=0 )) {kobject_put (&zone->kobj);return ret;
@@ -343,8 +343,8 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob, zone->used_mem =0 ; zone->glob = glob; glob->zone_dma32 = zone; -kobject_init (&zone->kobj, &ttm_mem_zone_kobj_type); - ret =kobject_add (&zone->kobj, &glob->kobj, zone->name); + ret =kobject_init_and_add ( + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);if (unlikely (ret !=0 )) {kobject_put (&zone->kobj);return ret;
@@ -365,10 +365,8 @@ int ttm_mem_global_init(struct ttm_mem_global *glob) glob->swap_queue =create_singlethread_workqueue ("ttm_swap" );INIT_WORK (&glob->work, ttm_shrink_work);init_waitqueue_head (&glob->queue); -kobject_init (&glob->kobj, &ttm_mem_glob_kobj_type); - ret =kobject_add (&glob->kobj, -ttm_get_kobj (), -"memory_accounting" ); + ret =kobject_init_and_add ( + &glob->kobj, &ttm_mem_glob_kobj_type,ttm_get_kobj (),"memory_accounting" );if (unlikely (ret !=0 )) {kobject_put (&glob->kobj);return ret;
========================================================================
Robert P. J. Day Waterloo, Ontario, CANADA
Linux Consulting, Training and Kernel Pedantry.
Web page: http://crashcourse.ca Twitter: http://twitter.com/rpjday
========================================================================
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
--