Commit 496d0cc6 authored by Emil Velikov's avatar Emil Velikov Committed by Emil Velikov
Browse files

drm/panfrost: 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: Rob Herring <robh@kernel.org>
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Steven Price <steven.price@arm.com>
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-28-emil.l.velikov@gmail.com
parent d742cdd6

drivers/gpu/drm/panfrost/panfrost_drv.c

+5 −5
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int panfrost_ioctl_create_bo(struct drm_device *dev, void *data, 


	mapping = panfrost_gem_mapping_get(bo, priv);

	if (!mapping) {

		drm_gem_object_put_unlocked(&bo->base.base);

		drm_gem_object_put(&bo->base.base);

		return -EINVAL;

	}
@@ -317,7 +317,7 @@ panfrost_ioctl_wait_bo(struct drm_device *dev, void *data, 
	if (!ret)

		ret = timeout ? -ETIMEDOUT : -EBUSY;



	drm_gem_object_put_unlocked(gem_obj);

	drm_gem_object_put(gem_obj);



	return ret;

}
@@ -351,7 +351,7 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data, 
		args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);



out:

	drm_gem_object_put_unlocked(gem_obj);

	drm_gem_object_put(gem_obj);

	return ret;

}
@@ -372,7 +372,7 @@ static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data, 
	bo = to_panfrost_bo(gem_obj);



	mapping = panfrost_gem_mapping_get(bo, priv);

	drm_gem_object_put_unlocked(gem_obj);

	drm_gem_object_put(gem_obj);



	if (!mapping)

		return -EINVAL;
@@ -438,7 +438,7 @@ out_unlock_mappings: 
	mutex_unlock(&bo->mappings.lock);

	mutex_unlock(&pfdev->shrinker_lock);



	drm_gem_object_put_unlocked(gem_obj);

	drm_gem_object_put(gem_obj);

	return ret;

}

drivers/gpu/drm/panfrost/panfrost_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static void panfrost_gem_mapping_release(struct kref *kref) 
	mapping = container_of(kref, struct panfrost_gem_mapping, refcount);



	panfrost_gem_teardown_mapping(mapping);

	drm_gem_object_put_unlocked(&mapping->obj->base.base);

	drm_gem_object_put(&mapping->obj->base.base);

	kfree(mapping);

}
@@ -261,7 +261,7 @@ panfrost_gem_create_with_handle(struct drm_file *file_priv, 
	 */

	ret = drm_gem_handle_create(file_priv, &shmem->base, handle);

	/* drop reference from allocate - handle holds it now. */

	drm_gem_object_put_unlocked(&shmem->base);

	drm_gem_object_put(&shmem->base);

	if (ret)

		return ERR_PTR(ret);

drivers/gpu/drm/panfrost/panfrost_job.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void panfrost_job_cleanup(struct kref *ref) 


	if (job->bos) {

		for (i = 0; i < job->bo_count; i++)

			drm_gem_object_put_unlocked(job->bos[i]);

			drm_gem_object_put(job->bos[i]);



		kvfree(job->bos);

	}

drivers/gpu/drm/panfrost/panfrost_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ err_map: 
err_pages:

	drm_gem_shmem_put_pages(&bo->base);

err_bo:

	drm_gem_object_put_unlocked(&bo->base.base);

	drm_gem_object_put(&bo->base.base);

	return ret;

}

drivers/gpu/drm/panfrost/panfrost_perfcnt.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev, 
		gpu_write(pfdev, GPU_PRFCNT_TILER_EN, 0xffffffff);



	/* The BO ref is retained by the mapping. */

	drm_gem_object_put_unlocked(&bo->base);

	drm_gem_object_put(&bo->base);



	return 0;
@@ -167,7 +167,7 @@ err_put_mapping: 
err_close_bo:

	panfrost_gem_close(&bo->base, file_priv);

err_put_bo:

	drm_gem_object_put_unlocked(&bo->base);

	drm_gem_object_put(&bo->base);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE