Commit e19baf70 authored by Emil Velikov's avatar Emil Velikov Committed by Emil Velikov
Browse files

drm/gma500: 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: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-20-emil.l.velikov@gmail.com
parent 1138a5f6

drivers/gpu/drm/gma500/framebuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static int psb_fbdev_destroy(struct drm_device *dev, 
	drm_framebuffer_cleanup(fb);



	if (fb->obj[0])

		drm_gem_object_put_unlocked(fb->obj[0]);

		drm_gem_object_put(fb->obj[0]);

	kfree(fb);



	return 0;

drivers/gpu/drm/gma500/gem.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ int psb_gem_create(struct drm_file *file, struct drm_device *dev, u64 size, 
		return ret;

	}

	/* We have the initial and handle reference but need only one now */

	drm_gem_object_put_unlocked(&r->gem);

	drm_gem_object_put(&r->gem);

	*handlep = handle;

	return 0;

}

drivers/gpu/drm/gma500/gma_display.c

+3 −3
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc, 
			gt = container_of(gma_crtc->cursor_obj,

					  struct gtt_range, gem);

			psb_gtt_unpin(gt);

			drm_gem_object_put_unlocked(gma_crtc->cursor_obj);

			drm_gem_object_put(gma_crtc->cursor_obj);

			gma_crtc->cursor_obj = NULL;

		}

		return 0;
@@ -427,7 +427,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc, 
	if (gma_crtc->cursor_obj) {

		gt = container_of(gma_crtc->cursor_obj, struct gtt_range, gem);

		psb_gtt_unpin(gt);

		drm_gem_object_put_unlocked(gma_crtc->cursor_obj);

		drm_gem_object_put(gma_crtc->cursor_obj);

	}



	gma_crtc->cursor_obj = obj;
@@ -435,7 +435,7 @@ unlock: 
	return ret;



unref_cursor:

	drm_gem_object_put_unlocked(obj);

	drm_gem_object_put(obj);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE