diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2020-05-15 10:50:54 +0100 | 
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2020-05-19 22:31:31 +0100 | 
| commit | e07ddb0ce7cde64fdfcd96e96d1dce8538fa0bb0 (patch) | |
| tree | 2e54f1717f75a9241c6f49d33d9552eedc7cdd57 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
| parent | be6ee102341bc4d07e050dda119ecb91229bc654 (diff) | |
drm/amd: remove _unlocked suffix in drm_gem_object_put_unlocked
Spelling out _unlocked for each and every driver is a annoying.
Especially if we consider how many drivers, do not know (or need to)
about the horror stories involving struct_mutex.
Just drop the suffix. It makes the API cleaner.
Done via the following script:
__from=drm_gem_object_put_unlocked
__to=drm_gem_object_put
for __file in $(git grep --name-only $__from); do
  sed -i  "s/$__from/$__to/g" $__file;
done
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-15-emil.l.velikov@gmail.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 20 | 
1 files changed, 10 insertions, 10 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index e42608115c99..8c0597f306ec 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -106,7 +106,7 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev)  		spin_lock(&file->table_lock);  		idr_for_each_entry(&file->object_idr, gobj, handle) {  			WARN_ONCE(1, "And also active allocations!\n"); -			drm_gem_object_put_unlocked(gobj); +			drm_gem_object_put(gobj);  		}  		idr_destroy(&file->object_idr);  		spin_unlock(&file->table_lock); @@ -272,7 +272,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,  	r = drm_gem_handle_create(filp, gobj, &handle);  	/* drop reference from allocate - handle holds it now */ -	drm_gem_object_put_unlocked(gobj); +	drm_gem_object_put(gobj);  	if (r)  		return r; @@ -356,7 +356,7 @@ user_pages_done:  		amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm);  release_object: -	drm_gem_object_put_unlocked(gobj); +	drm_gem_object_put(gobj);  	return r;  } @@ -375,11 +375,11 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,  	robj = gem_to_amdgpu_bo(gobj);  	if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm) ||  	    (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) { -		drm_gem_object_put_unlocked(gobj); +		drm_gem_object_put(gobj);  		return -EPERM;  	}  	*offset_p = amdgpu_bo_mmap_offset(robj); -	drm_gem_object_put_unlocked(gobj); +	drm_gem_object_put(gobj);  	return 0;  } @@ -449,7 +449,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,  	} else  		r = ret; -	drm_gem_object_put_unlocked(gobj); +	drm_gem_object_put(gobj);  	return r;  } @@ -492,7 +492,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,  unreserve:  	amdgpu_bo_unreserve(robj);  out: -	drm_gem_object_put_unlocked(gobj); +	drm_gem_object_put(gobj);  	return r;  } @@ -691,7 +691,7 @@ error_backoff:  	ttm_eu_backoff_reservation(&ticket, &list);  error_unref: -	drm_gem_object_put_unlocked(gobj); +	drm_gem_object_put(gobj);  	return r;  } @@ -767,7 +767,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,  	}  out: -	drm_gem_object_put_unlocked(gobj); +	drm_gem_object_put(gobj);  	return r;  } @@ -804,7 +804,7 @@ int amdgpu_mode_dumb_create(struct drm_file *file_priv,  	r = drm_gem_handle_create(file_priv, gobj, &handle);  	/* drop reference from allocate - handle holds it now */ -	drm_gem_object_put_unlocked(gobj); +	drm_gem_object_put(gobj);  	if (r) {  		return r;  	} | 
