drm/fb-helper: Improve code readability

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

Tested-by: John Stultz <john.stultz@linaro.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170329144401.1804-4-thierry.reding@gmail.com

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 875a4904822256d75f3080d9dbef17ee19725571..8afc1bb287a2d5c212431226599ccdd0acab4275 100644 (file)
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -109,31 +109,38 @@ static DEFINE_MUTEX(kernel_fb_helper_lock);
        for (({ lockdep_assert_held(&(fbh)->dev->mode_config.mutex); }), \
             i__ = 0; i__ < (fbh)->connector_count; i__++)
 
-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 *fb_conn;
        struct drm_fb_helper_connector **temp;
-       struct drm_fb_helper_connector *fb_helper_connector;
+       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(fb_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)
+       fb_conn = kzalloc(sizeof(*fb_conn), GFP_KERNEL);
+       if (!fb_conn)
                return -ENOMEM;
 
        drm_connector_get(connector);
-       fb_helper_connector->connector = connector;
-       fb_helper->connector_info[fb_helper->connector_count++] = fb_helper_connector;
+       fb_conn->connector = connector;
+       fb_helper->connector_info[fb_helper->connector_count++] = fb_conn;
        return 0;
 }
 EXPORT_SYMBOL(drm_fb_helper_add_one_connector);