drm: Don't initialize local ret variable when not needed

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

9 files changed, 24 insertions, 32 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index a177d0abb8bb..da737ef7759e 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1829,7 +1829,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
         struct drm_display_mode *mode = NULL;
         struct drm_mode_set set;
         uint32_t __user *set_connectors_ptr;
-        int ret = 0;
+        int ret;
         int i;
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
@@ -2248,7 +2248,7 @@ int drm_mode_addfb2(struct drm_device *dev,
         struct drm_mode_fb_cmd2 *r = data;
         struct drm_mode_config *config = &dev->mode_config;
         struct drm_framebuffer *fb;
-        int ret = 0;
+        int ret;
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
                 return -EINVAL;
@@ -2403,7 +2403,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
         struct drm_framebuffer *fb;
         unsigned flags;
         int num_clips;
-        int ret = 0;
+        int ret;
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
                 return -EINVAL;
@@ -2602,7 +2602,7 @@ int drm_mode_attachmode_ioctl(struct drm_device *dev,
         struct drm_display_mode *mode;
         struct drm_mode_object *obj;
         struct drm_mode_modeinfo *umode = &mode_cmd->mode;
-        int ret = 0;
+        int ret;
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
                 return -EINVAL;
@@ -2656,7 +2656,7 @@ int drm_mode_detachmode_ioctl(struct drm_device *dev,
         struct drm_connector *connector;
         struct drm_display_mode mode;
         struct drm_mode_modeinfo *umode = &mode_cmd->mode;
-        int ret = 0;
+        int ret;
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
                 return -EINVAL;
@@ -3065,7 +3065,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
                                             struct edid *edid)
 {
         struct drm_device *dev = connector->dev;
-        int ret = 0, size;
+        int ret, size;
 
         if (connector->edid_blob_ptr)
                 drm_property_destroy_blob(dev, connector->edid_blob_ptr);
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 974196ab7b22..3252e7067d8b 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -518,7 +518,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
         int count = 0, ro, fail = 0;
         struct drm_crtc_helper_funcs *crtc_funcs;
         struct drm_mode_set save_set;
-        int ret = 0;
+        int ret;
         int i;
 
         DRM_DEBUG_KMS("\n");
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
index 48c927c37041..66d4a28ad5a2 100644
--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c
@@ -220,18 +220,18 @@ int drm_load_edid_firmware(struct drm_connector *connector)
 {
         char *connector_name = drm_get_connector_name(connector);
         char *edidname = edid_firmware, *last, *colon;
-        int ret = 0;
+        int ret;
 
         if (*edidname == '\0')
-                return ret;
+                return 0;
 
         colon = strchr(edidname, ':');
         if (colon != NULL) {
                 if (strncmp(connector_name, edidname, colon - edidname))
-                        return ret;
+                        return 0;
                 edidname = colon + 1;
                 if (*edidname == '\0')
-                        return ret;
+                        return 0;
         }
 
         last = edidname + strlen(edidname) - 1;
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 6e19dd156be0..9b773d51cff5 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -383,7 +383,6 @@ int drm_fb_helper_init(struct drm_device *dev,
                        int crtc_count, int max_conn_count)
 {
         struct drm_crtc *crtc;
-        int ret = 0;
         int i;
 
         fb_helper->dev = dev;
@@ -408,10 +407,8 @@ int drm_fb_helper_init(struct drm_device *dev,
                                 sizeof(struct drm_connector *),
                                 GFP_KERNEL);
 
-                if (!fb_helper->crtc_info[i].mode_set.connectors) {
-                        ret = -ENOMEM;
+                if (!fb_helper->crtc_info[i].mode_set.connectors)
                         goto out_free;
-                }
                 fb_helper->crtc_info[i].mode_set.num_connectors = 0;
         }
 
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 1ab29a7345c5..72ba0757feaa 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -328,7 +328,7 @@ drm_gem_create_mmap_offset(struct drm_gem_object *obj)
         struct drm_gem_mm *mm = dev->mm_private;
         struct drm_map_list *list;
         struct drm_local_map *map;
-        int ret = 0;
+        int ret;
 
         /* Set the object up for mmap'ing */
         list = &obj->map_list;
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index acd2cb45a513..c798eeae0a03 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -310,7 +310,7 @@ static void drm_irq_vgaarb_nokms(void *cookie, bool state)
  */
 int drm_irq_install(struct drm_device *dev)
 {
-        int ret = 0;
+        int ret;
         unsigned long sh_flags = 0;
         char *irqname;
 
@@ -731,7 +731,7 @@ EXPORT_SYMBOL(drm_calc_vbltimestamp_from_scanoutpos);
 u32 drm_get_last_vbltimestamp(struct drm_device *dev, int crtc,
                               struct timeval *tvblank, unsigned flags)
 {
-        int ret = 0;
+        int ret;
 
         /* Define requested maximum error on timestamps (nanoseconds). */
         int max_error = (int) drm_timestamp_precision * 1000;
@@ -1031,18 +1031,15 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
                     struct drm_file *file_priv)
 {
         struct drm_modeset_ctl *modeset = data;
-        int ret = 0;
         unsigned int crtc;
 
         /* If drm_vblank_init() hasn't been called yet, just no-op */
         if (!dev->num_crtcs)
-                goto out;
+                return 0;
 
         crtc = modeset->crtc;
-        if (crtc >= dev->num_crtcs) {
-                ret = -EINVAL;
-                goto out;
-        }
+        if (crtc >= dev->num_crtcs)
+                return -EINVAL;
 
         switch (modeset->cmd) {
         case _DRM_PRE_MODESET:
@@ -1052,12 +1049,10 @@ int drm_modeset_ctl(struct drm_device *dev, void *data,
                 drm_vblank_post_modeset(dev, crtc);
                 break;
         default:
-                ret = -EINVAL;
-                break;
+                return -EINVAL;
         }
 
-out:
-        return ret;
+        return 0;
 }
 
 static int drm_queue_vblank_event(struct drm_device *dev, int pipe,
@@ -1154,7 +1149,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
                     struct drm_file *file_priv)
 {
         union drm_wait_vblank *vblwait = data;
-        int ret = 0;
+        int ret;
         unsigned int flags, seq, crtc, high_crtc;
 
         if ((!drm_dev_to_irq(dev)) || (!dev->irq_enabled))
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index c79c713eeba0..521152041691 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -331,7 +331,7 @@ static int drm_notifier(void *priv)
 
 void drm_idlelock_take(struct drm_lock_data *lock_data)
 {
-        int ret = 0;
+        int ret;
 
         spin_lock_bh(&lock_data->spinlock);
         lock_data->kernel_waiters++;
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index ae1ccf1d5d96..21bcd4a555d8 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -210,7 +210,7 @@ EXPORT_SYMBOL(drm_master_put);
 int drm_setmaster_ioctl(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
 {
-        int ret = 0;
+        int ret;
 
         if (file_priv->is_master)
                 return 0;
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 5a7bd51fc3d8..c29fa9c968ae 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -366,7 +366,7 @@ int drm_sysfs_connector_add(struct drm_connector *connector)
         int attr_cnt = 0;
         int opt_cnt = 0;
         int i;
-        int ret = 0;
+        int ret;
 
         /* We shouldn't get called more than once for the same connector */
         BUG_ON(device_is_registered(&connector->kdev));