diff options
author | Thomas Zimmermann <tdz@users.sourceforge.net> | 2018-06-18 09:07:26 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-10-02 02:36:56 -0400 |
commit | e64d0229340dff8746a1b55e0bcf0dbac6cb5874 (patch) | |
tree | ee0f368a95b46e3a4879482c2bea56ca56959791 /drivers/gpu | |
parent | 3ce11806c0ba279b5893bb9eb1d193e1acbef7b6 (diff) |
drm/omap: Replace drm_gem_object_unreference_unlocked with put function
This patch unifies the naming of DRM functions for reference counting
of struct drm_gem_object. The resulting code is more aligned with the
rest of the Linux kernel interfaces.
Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fb.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 5f98506ac2c5..f14d02ca968c 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
@@ -439,7 +439,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data, | |||
439 | args->size = omap_gem_mmap_size(obj); | 439 | args->size = omap_gem_mmap_size(obj); |
440 | args->offset = omap_gem_mmap_offset(obj); | 440 | args->offset = omap_gem_mmap_offset(obj); |
441 | 441 | ||
442 | drm_gem_object_unreference_unlocked(obj); | 442 | drm_gem_object_put_unlocked(obj); |
443 | 443 | ||
444 | return ret; | 444 | return ret; |
445 | } | 445 | } |
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c index 9f1e3d8f8488..4d264fd554d8 100644 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c | |||
@@ -319,7 +319,7 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev, | |||
319 | 319 | ||
320 | error: | 320 | error: |
321 | while (--i >= 0) | 321 | while (--i >= 0) |
322 | drm_gem_object_unreference_unlocked(bos[i]); | 322 | drm_gem_object_put_unlocked(bos[i]); |
323 | 323 | ||
324 | return fb; | 324 | return fb; |
325 | } | 325 | } |
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index b445309b0143..aee99194499f 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c | |||
@@ -150,7 +150,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, | |||
150 | /* note: if fb creation failed, we can't rely on fb destroy | 150 | /* note: if fb creation failed, we can't rely on fb destroy |
151 | * to unref the bo: | 151 | * to unref the bo: |
152 | */ | 152 | */ |
153 | drm_gem_object_unreference_unlocked(fbdev->bo); | 153 | drm_gem_object_put_unlocked(fbdev->bo); |
154 | ret = PTR_ERR(fb); | 154 | ret = PTR_ERR(fb); |
155 | goto fail; | 155 | goto fail; |
156 | } | 156 | } |
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 4ba5d035c590..8dcaf9f4aa75 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c | |||
@@ -638,7 +638,7 @@ int omap_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, | |||
638 | 638 | ||
639 | *offset = omap_gem_mmap_offset(obj); | 639 | *offset = omap_gem_mmap_offset(obj); |
640 | 640 | ||
641 | drm_gem_object_unreference_unlocked(obj); | 641 | drm_gem_object_put_unlocked(obj); |
642 | 642 | ||
643 | fail: | 643 | fail: |
644 | return ret; | 644 | return ret; |
@@ -1312,7 +1312,7 @@ int omap_gem_new_handle(struct drm_device *dev, struct drm_file *file, | |||
1312 | } | 1312 | } |
1313 | 1313 | ||
1314 | /* drop reference from allocate - handle holds it now */ | 1314 | /* drop reference from allocate - handle holds it now */ |
1315 | drm_gem_object_unreference_unlocked(obj); | 1315 | drm_gem_object_put_unlocked(obj); |
1316 | 1316 | ||
1317 | return 0; | 1317 | return 0; |
1318 | } | 1318 | } |