From: Thierry Reding <tred...@nvidia.com>

Add a couple of temporary variables and use shorter names for existing
variables in drm_fb_helper_add_one_connector() for better readability.

Signed-off-by: Thierry Reding <treding at nvidia.com>
---
 drivers/gpu/drm/drm_fb_helper.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 301644d12013..9afd4208596f 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -95,32 +95,38 @@ static LIST_HEAD(kernel_fb_helper_list);
  * mmap page writes.
  */

-int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct 
drm_connector *connector)
+int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper,
+                                   struct drm_connector *connector)
 {
        struct drm_fb_helper_connector **temp;
-       struct drm_fb_helper_connector *fb_helper_connector;
+       struct drm_fb_helper_connector *conn;
+       unsigned int count;

        if (!drm_fbdev_emulation)
                return 0;

        WARN_ON(!mutex_is_locked(&fb_helper->dev->mode_config.mutex));
-       if (fb_helper->connector_count + 1 > 
fb_helper->connector_info_alloc_count) {
-               temp = krealloc(fb_helper->connector_info, sizeof(struct 
drm_fb_helper_connector *) * (fb_helper->connector_count + 1), GFP_KERNEL);
+
+       count = fb_helper->connector_count + 1;
+
+       if (count > fb_helper->connector_info_alloc_count) {
+               size_t size = count * sizeof(conn);
+
+               temp = krealloc(fb_helper->connector_info, size, GFP_KERNEL);
                if (!temp)
                        return -ENOMEM;

-               fb_helper->connector_info_alloc_count = 
fb_helper->connector_count + 1;
+               fb_helper->connector_info_alloc_count = count;
                fb_helper->connector_info = temp;
        }

-
-       fb_helper_connector = kzalloc(sizeof(struct drm_fb_helper_connector), 
GFP_KERNEL);
-       if (!fb_helper_connector)
+       conn = kzalloc(sizeof(*conn), GFP_KERNEL);
+       if (!conn)
                return -ENOMEM;

        drm_connector_reference(connector);
-       fb_helper_connector->connector = connector;
-       fb_helper->connector_info[fb_helper->connector_count++] = 
fb_helper_connector;
+       conn->connector = connector;
+       fb_helper->connector_info[fb_helper->connector_count++] = conn;
        return 0;
 }
 EXPORT_SYMBOL(drm_fb_helper_add_one_connector);
-- 
2.8.3

Reply via email to