diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2015-11-06 06:03:46 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-24 05:41:52 -0500 |
commit | 5f911905054a64cf8c7871fddd33f4af74f07a17 (patch) | |
tree | 4f4ee9a444261b3939863eb6ca65db007cc8fcc8 /drivers/gpu/drm/drm_atomic.c | |
parent | 36af4ca704897f56b6b168c73d964030fd4ce359 (diff) |
GPU-DRM: Delete unnecessary checks before drm_property_unreference_blob()
The drm_property_unreference_blob() function tests whether its argument
is NULL and then returns immediately.
Thus the tests around the calls are not needed.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Link: http://patchwork.freedesktop.org/patch/msgid/563C8B3E.405@users.sourceforge.net
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
-rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index aeee083c7f95..91825e661977 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c | |||
@@ -316,8 +316,7 @@ int drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state, | |||
316 | if (mode && memcmp(&state->mode, mode, sizeof(*mode)) == 0) | 316 | if (mode && memcmp(&state->mode, mode, sizeof(*mode)) == 0) |
317 | return 0; | 317 | return 0; |
318 | 318 | ||
319 | if (state->mode_blob) | 319 | drm_property_unreference_blob(state->mode_blob); |
320 | drm_property_unreference_blob(state->mode_blob); | ||
321 | state->mode_blob = NULL; | 320 | state->mode_blob = NULL; |
322 | 321 | ||
323 | if (mode) { | 322 | if (mode) { |
@@ -363,8 +362,7 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state, | |||
363 | if (blob == state->mode_blob) | 362 | if (blob == state->mode_blob) |
364 | return 0; | 363 | return 0; |
365 | 364 | ||
366 | if (state->mode_blob) | 365 | drm_property_unreference_blob(state->mode_blob); |
367 | drm_property_unreference_blob(state->mode_blob); | ||
368 | state->mode_blob = NULL; | 366 | state->mode_blob = NULL; |
369 | 367 | ||
370 | if (blob) { | 368 | if (blob) { |
@@ -419,8 +417,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, | |||
419 | struct drm_property_blob *mode = | 417 | struct drm_property_blob *mode = |
420 | drm_property_lookup_blob(dev, val); | 418 | drm_property_lookup_blob(dev, val); |
421 | ret = drm_atomic_set_mode_prop_for_crtc(state, mode); | 419 | ret = drm_atomic_set_mode_prop_for_crtc(state, mode); |
422 | if (mode) | 420 | drm_property_unreference_blob(mode); |
423 | drm_property_unreference_blob(mode); | ||
424 | return ret; | 421 | return ret; |
425 | } | 422 | } |
426 | else if (crtc->funcs->atomic_set_property) | 423 | else if (crtc->funcs->atomic_set_property) |