[PATCH] drm/exynos: cleanup name of gem object for exynos_drm

[Inki Dae]

Merged.

Thanks,
Inki Dae

2015년 10월 02일 09:33에 Joonyoung Shim 이(가) 쓴 글:
> Struct of gem object in exynos_drm driver is struct exynos_drm_gem_obj.
> It's too long and we can know its meaning of name without _obj postfix.
>
> We use several names to variable name of gem object for exynos_drm -
> exynos_gem_obj, gem_obj and obj. Especially "obj" name can cause
> misunderstanding with variable name "obj" of struct drm_gem_object.
>
> This will clean about name of gem object for exynos_drm as follows.
> s/struct exynos_drm_gem_obj/struct exynos_drm_gem
> s/exynos_gem_obj or gem_obj or obj/exynos_gem
>
> Signed-off-by: Joonyoung Shim 
> ---
>   drivers/gpu/drm/exynos/exynos_drm_fb.c|  45 +++---
>   drivers/gpu/drm/exynos/exynos_drm_fb.h|   5 +-
>   drivers/gpu/drm/exynos/exynos_drm_fbdev.c |  53 +++
>   drivers/gpu/drm/exynos/exynos_drm_gem.c   | 239 
> +++---
>   drivers/gpu/drm/exynos/exynos_drm_gem.h   |  15 +-
>   drivers/gpu/drm/exynos/exynos_drm_plane.c |   9 +-
>   6 files changed, 184 insertions(+), 182 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c 
> b/drivers/gpu/drm/exynos/exynos_drm_fb.c
> index 0842808..fcea28b 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
> @@ -32,15 +32,15 @@
>* exynos specific framebuffer structure.
>*
>* @fb: drm framebuffer obejct.
> - * @exynos_gem_obj: array of exynos specific gem object containing a gem 
> object.
> + * @exynos_gem: array of exynos specific gem object containing a gem object.
>*/
>   struct exynos_drm_fb {
> - struct drm_framebuffer  fb;
> - struct exynos_drm_gem_obj   *exynos_gem_obj[MAX_FB_BUFFER];
> + struct drm_framebuffer  fb;
> + struct exynos_drm_gem   *exynos_gem[MAX_FB_BUFFER];
>   };
>
>   static int check_fb_gem_memory_type(struct drm_device *drm_dev,
> - struct exynos_drm_gem_obj *exynos_gem_obj)
> + struct exynos_drm_gem *exynos_gem)
>   {
>   unsigned int flags;
>
> @@ -51,7 +51,7 @@ static int check_fb_gem_memory_type(struct drm_device 
> *drm_dev,
>   if (is_drm_iommu_supported(drm_dev))
>   return 0;
>
> - flags = exynos_gem_obj->flags;
> + flags = exynos_gem->flags;
>
>   /*
>* without iommu support, not support physically non-continuous memory
> @@ -75,13 +75,13 @@ static void exynos_drm_fb_destroy(struct drm_framebuffer 
> *fb)
>
>   drm_framebuffer_cleanup(fb);
>
> - for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem_obj); i++) {
> + for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem); i++) {
>   struct drm_gem_object *obj;
>
> - if (exynos_fb->exynos_gem_obj[i] == NULL)
> + if (exynos_fb->exynos_gem[i] == NULL)
>   continue;
>
> - obj = &exynos_fb->exynos_gem_obj[i]->base;
> + obj = &exynos_fb->exynos_gem[i]->base;
>   drm_gem_object_unreference_unlocked(obj);
>   }
>
> @@ -96,7 +96,7 @@ static int exynos_drm_fb_create_handle(struct 
> drm_framebuffer *fb,
>   struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);
>
>   return drm_gem_handle_create(file_priv,
> - &exynos_fb->exynos_gem_obj[0]->base, handle);
> +  &exynos_fb->exynos_gem[0]->base, handle);
>   }
>
>   static int exynos_drm_fb_dirty(struct drm_framebuffer *fb,
> @@ -118,7 +118,7 @@ static struct drm_framebuffer_funcs exynos_drm_fb_funcs = 
> {
>   struct drm_framebuffer *
>   exynos_drm_framebuffer_init(struct drm_device *dev,
>   struct drm_mode_fb_cmd2 *mode_cmd,
> - struct exynos_drm_gem_obj **gem_obj,
> + struct exynos_drm_gem **exynos_gem,
>   int count)
>   {
>   struct exynos_drm_fb *exynos_fb;
> @@ -130,11 +130,11 @@ exynos_drm_framebuffer_init(struct drm_device *dev,
>   return ERR_PTR(-ENOMEM);
>
>   for (i = 0; i < count; i++) {
> - ret = check_fb_gem_memory_type(dev, gem_obj[i]);
> + ret = check_fb_gem_memory_type(dev, exynos_gem[i]);
>   if (ret < 0)
>   goto err;
>
> - exynos_fb->exynos_gem_obj[i] = gem_obj[i];
> + exynos_fb->exynos_gem[i] = exynos_gem[i];
>   }
>
>   drm_helper_mode_fill_fb_struct(&exynos_fb->fb, mode_cmd);
> @@ -156,7 +156,7 @@ static struct drm_framebuffer *
>   exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
> struct drm_mode_fb_cmd2 *mode_cmd)
>   {
> - struct exynos_drm_gem_obj *gem_objs[MAX_FB_BUFFER];
> + struct exynos_drm_gem *exynos_gem[MAX_FB_BUFFER];
>   struct drm_gem_object *obj;
>   struct drm_framebuffer *fb;
>   int i;
> @@ -171,10 +171,10 @@ exynos_user_fb_create(struct drm_device *dev, struct 
> drm_file *file_priv,
> 

[PATCH] drm/exynos: cleanup name of gem object for exynos_drm

[Joonyoung Shim]

Struct of gem object in exynos_drm driver is struct exynos_drm_gem_obj.
It's too long and we can know its meaning of name without _obj postfix.

We use several names to variable name of gem object for exynos_drm -
exynos_gem_obj, gem_obj and obj. Especially "obj" name can cause
misunderstanding with variable name "obj" of struct drm_gem_object.

This will clean about name of gem object for exynos_drm as follows.
s/struct exynos_drm_gem_obj/struct exynos_drm_gem
s/exynos_gem_obj or gem_obj or obj/exynos_gem

Signed-off-by: Joonyoung Shim 
---
 drivers/gpu/drm/exynos/exynos_drm_fb.c|  45 +++---
 drivers/gpu/drm/exynos/exynos_drm_fb.h|   5 +-
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c |  53 +++
 drivers/gpu/drm/exynos/exynos_drm_gem.c   | 239 +++---
 drivers/gpu/drm/exynos/exynos_drm_gem.h   |  15 +-
 drivers/gpu/drm/exynos/exynos_drm_plane.c |   9 +-
 6 files changed, 184 insertions(+), 182 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c 
b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index 0842808..fcea28b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -32,15 +32,15 @@
  * exynos specific framebuffer structure.
  *
  * @fb: drm framebuffer obejct.
- * @exynos_gem_obj: array of exynos specific gem object containing a gem 
object.
+ * @exynos_gem: array of exynos specific gem object containing a gem object.
  */
 struct exynos_drm_fb {
-   struct drm_framebuffer  fb;
-   struct exynos_drm_gem_obj   *exynos_gem_obj[MAX_FB_BUFFER];
+   struct drm_framebuffer  fb;
+   struct exynos_drm_gem   *exynos_gem[MAX_FB_BUFFER];
 };

 static int check_fb_gem_memory_type(struct drm_device *drm_dev,
-   struct exynos_drm_gem_obj *exynos_gem_obj)
+   struct exynos_drm_gem *exynos_gem)
 {
unsigned int flags;

@@ -51,7 +51,7 @@ static int check_fb_gem_memory_type(struct drm_device 
*drm_dev,
if (is_drm_iommu_supported(drm_dev))
return 0;

-   flags = exynos_gem_obj->flags;
+   flags = exynos_gem->flags;

/*
 * without iommu support, not support physically non-continuous memory
@@ -75,13 +75,13 @@ static void exynos_drm_fb_destroy(struct drm_framebuffer 
*fb)

drm_framebuffer_cleanup(fb);

-   for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem_obj); i++) {
+   for (i = 0; i < ARRAY_SIZE(exynos_fb->exynos_gem); i++) {
struct drm_gem_object *obj;

-   if (exynos_fb->exynos_gem_obj[i] == NULL)
+   if (exynos_fb->exynos_gem[i] == NULL)
continue;

-   obj = &exynos_fb->exynos_gem_obj[i]->base;
+   obj = &exynos_fb->exynos_gem[i]->base;
drm_gem_object_unreference_unlocked(obj);
}

@@ -96,7 +96,7 @@ static int exynos_drm_fb_create_handle(struct drm_framebuffer 
*fb,
struct exynos_drm_fb *exynos_fb = to_exynos_fb(fb);

return drm_gem_handle_create(file_priv,
-   &exynos_fb->exynos_gem_obj[0]->base, handle);
+&exynos_fb->exynos_gem[0]->base, handle);
 }

 static int exynos_drm_fb_dirty(struct drm_framebuffer *fb,
@@ -118,7 +118,7 @@ static struct drm_framebuffer_funcs exynos_drm_fb_funcs = {
 struct drm_framebuffer *
 exynos_drm_framebuffer_init(struct drm_device *dev,
struct drm_mode_fb_cmd2 *mode_cmd,
-   struct exynos_drm_gem_obj **gem_obj,
+   struct exynos_drm_gem **exynos_gem,
int count)
 {
struct exynos_drm_fb *exynos_fb;
@@ -130,11 +130,11 @@ exynos_drm_framebuffer_init(struct drm_device *dev,
return ERR_PTR(-ENOMEM);

for (i = 0; i < count; i++) {
-   ret = check_fb_gem_memory_type(dev, gem_obj[i]);
+   ret = check_fb_gem_memory_type(dev, exynos_gem[i]);
if (ret < 0)
goto err;

-   exynos_fb->exynos_gem_obj[i] = gem_obj[i];
+   exynos_fb->exynos_gem[i] = exynos_gem[i];
}

drm_helper_mode_fill_fb_struct(&exynos_fb->fb, mode_cmd);
@@ -156,7 +156,7 @@ static struct drm_framebuffer *
 exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
  struct drm_mode_fb_cmd2 *mode_cmd)
 {
-   struct exynos_drm_gem_obj *gem_objs[MAX_FB_BUFFER];
+   struct exynos_drm_gem *exynos_gem[MAX_FB_BUFFER];
struct drm_gem_object *obj;
struct drm_framebuffer *fb;
int i;
@@ -171,10 +171,10 @@ exynos_user_fb_create(struct drm_device *dev, struct 
drm_file *file_priv,
goto err;
}

-   gem_objs[i] = to_exynos_gem_obj(obj);
+   exynos_gem[i] = to_exynos_gem(obj);
}

-   fb = exynos_drm_framebuffer_init(dev, mode_cmd, gem_objs, i);
+   fb = e