aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCihangir Akturk <cakturk@gmail.com>2017-08-11 08:33:00 -0400
committerSean Paul <seanpaul@chromium.org>2017-08-11 11:56:03 -0400
commitc7ff96f8bbe590f8ac4aab122422231c18326dbe (patch)
tree7d3b0352849f2eb50c01756c799abe52b809e562
parentc54fd47aa5b8bc39d707d3011c9b418c6b81004b (diff)
drm/mgag200: switch to drm_*_get(), drm_*_put() helpers
Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference() and drm_*_unreference() helpers. drm_*_reference() and drm_*_unreference() functions are just compatibility alias for drm_*_get() and drm_*_put() and should not be used by new code. So convert all users of compatibility functions to use the new APIs. Generated by: scripts/coccinelle/api/drm-get-put.cocci Signed-off-by: Cihangir Akturk <cakturk@gmail.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/1502454794-28558-15-git-send-email-cakturk@gmail.com
-rw-r--r--drivers/gpu/drm/mgag200/mgag200_cursor.c2
-rw-r--r--drivers/gpu/drm/mgag200/mgag200_fb.c4
-rw-r--r--drivers/gpu/drm/mgag200/mgag200_main.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c
index 2ac3fcbfea7b..968e20379d54 100644
--- a/drivers/gpu/drm/mgag200/mgag200_cursor.c
+++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c
@@ -248,7 +248,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
248out_unreserve1: 248out_unreserve1:
249 mgag200_bo_unreserve(pixels_2); 249 mgag200_bo_unreserve(pixels_2);
250out_unref: 250out_unref:
251 drm_gem_object_unreference_unlocked(obj); 251 drm_gem_object_put_unlocked(obj);
252 252
253 return ret; 253 return ret;
254} 254}
diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
index 9d914ca69996..30726c9fe28c 100644
--- a/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -232,7 +232,7 @@ static int mgag200fb_create(struct drm_fb_helper *helper,
232err_alloc_fbi: 232err_alloc_fbi:
233 vfree(sysram); 233 vfree(sysram);
234err_sysram: 234err_sysram:
235 drm_gem_object_unreference_unlocked(gobj); 235 drm_gem_object_put_unlocked(gobj);
236 236
237 return ret; 237 return ret;
238} 238}
@@ -245,7 +245,7 @@ static int mga_fbdev_destroy(struct drm_device *dev,
245 drm_fb_helper_unregister_fbi(&mfbdev->helper); 245 drm_fb_helper_unregister_fbi(&mfbdev->helper);
246 246
247 if (mfb->obj) { 247 if (mfb->obj) {
248 drm_gem_object_unreference_unlocked(mfb->obj); 248 drm_gem_object_put_unlocked(mfb->obj);
249 mfb->obj = NULL; 249 mfb->obj = NULL;
250 } 250 }
251 drm_fb_helper_fini(&mfbdev->helper); 251 drm_fb_helper_fini(&mfbdev->helper);
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
index dce8a3eb5a10..780f983b0294 100644
--- a/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -18,7 +18,7 @@ static void mga_user_framebuffer_destroy(struct drm_framebuffer *fb)
18{ 18{
19 struct mga_framebuffer *mga_fb = to_mga_framebuffer(fb); 19 struct mga_framebuffer *mga_fb = to_mga_framebuffer(fb);
20 20
21 drm_gem_object_unreference_unlocked(mga_fb->obj); 21 drm_gem_object_put_unlocked(mga_fb->obj);
22 drm_framebuffer_cleanup(fb); 22 drm_framebuffer_cleanup(fb);
23 kfree(fb); 23 kfree(fb);
24} 24}
@@ -59,13 +59,13 @@ mgag200_user_framebuffer_create(struct drm_device *dev,
59 59
60 mga_fb = kzalloc(sizeof(*mga_fb), GFP_KERNEL); 60 mga_fb = kzalloc(sizeof(*mga_fb), GFP_KERNEL);
61 if (!mga_fb) { 61 if (!mga_fb) {
62 drm_gem_object_unreference_unlocked(obj); 62 drm_gem_object_put_unlocked(obj);
63 return ERR_PTR(-ENOMEM); 63 return ERR_PTR(-ENOMEM);
64 } 64 }
65 65
66 ret = mgag200_framebuffer_init(dev, mga_fb, mode_cmd, obj); 66 ret = mgag200_framebuffer_init(dev, mga_fb, mode_cmd, obj);
67 if (ret) { 67 if (ret) {
68 drm_gem_object_unreference_unlocked(obj); 68 drm_gem_object_put_unlocked(obj);
69 kfree(mga_fb); 69 kfree(mga_fb);
70 return ERR_PTR(ret); 70 return ERR_PTR(ret);
71 } 71 }
@@ -317,7 +317,7 @@ int mgag200_dumb_create(struct drm_file *file,
317 return ret; 317 return ret;
318 318
319 ret = drm_gem_handle_create(file, gobj, &handle); 319 ret = drm_gem_handle_create(file, gobj, &handle);
320 drm_gem_object_unreference_unlocked(gobj); 320 drm_gem_object_put_unlocked(gobj);
321 if (ret) 321 if (ret)
322 return ret; 322 return ret;
323 323
@@ -366,6 +366,6 @@ mgag200_dumb_mmap_offset(struct drm_file *file,
366 bo = gem_to_mga_bo(obj); 366 bo = gem_to_mga_bo(obj);
367 *offset = mgag200_bo_mmap_offset(bo); 367 *offset = mgag200_bo_mmap_offset(bo);
368 368
369 drm_gem_object_unreference_unlocked(obj); 369 drm_gem_object_put_unlocked(obj);
370 return 0; 370 return 0;
371} 371}