From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033220AbbKFLNO (ORCPT ); Fri, 6 Nov 2015 06:13:14 -0500 Received: from mout.web.de ([212.227.17.12]:49343 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031997AbbKFLNM (ORCPT ); Fri, 6 Nov 2015 06:13:12 -0500 Subject: [PATCH] GPU-DRM: Delete unnecessary checks before drm_property_unreference_blob() To: Daniel Vetter , David Airlie , dri-devel@lists.freedesktop.org References: <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <55998CD5.3080204@users.sourceforge.net> <20150706065346.GA2156@phenom.ffwll.local> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Junwang Zhao From: SF Markus Elfring X-Enigmail-Draft-Status: N1110 Message-ID: <563C8B3E.405@users.sourceforge.net> Date: Fri, 6 Nov 2015 12:13:02 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20150706065346.GA2156@phenom.ffwll.local> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:BO2o3JoHJ3OY+tKk43CcArs57kwnoT7o35RpOJ1HjntmBIgGjn4 oSgorgCxCGTGMXQx+UNGsnMI4wktChIVowcr8qvGXH/jCNJTDmIwas3LTXWOOgGsqTT5p/u HrwuKtS0bmdY0JXAEmHhlNrxdi667KE/ebvQZu3qIU7fHubFGrMSrJGR6Hj4sPr7VpRHmzE V8AF+XPbhmWs7LgH+nkYg== X-UI-Out-Filterresults: notjunk:1;V01:K0:vISgsV+Ruxc=:ZAraS9q4ReO1JEl2eGAvSN omu2XaVFYfkYFwX0MajAU3se0y+PvG/nT8/H3kC6CjDrZ58lDFYL2csqYMFZgcDChfAerqujE 1xUE0hnQ0S29xl3vGw7hGHaisfnm8WJf5kc6XkxWhzq4RToP4/KysVTWxCZwAlBGKKNCz97hT aPAHSPY7aK7ZD70yjj5AVQ4VUjvpHDwVNOz/VBYUFW5lMx5F3EfK7D4/E8RluFVAc7vABqmG5 gyfDWumocePKKf5V1k/pYMUNYzixtD0BRCykYj6YJo1l0q8vfzWPnwE5xdIFi9X8eleUeHytZ m6I+jIRqNECKVZsFT7KNgTWGc3cM7Xe3WKO6T1x7R+9jGMp7ZWHE/vOLpfnJTUVz8ZGIHRBYF zIaM65Q8jSzHzXxJrng8OueJEaVmNekFhNggpsNehln5uQtsxMZfJxhOkshzzmEQsTsGXQWFB pMYmnT/ift6ZzxnKfPtiwiATA79QZJlC+Hr01iQ4sq9voh2F918eoAPHwIUvpTyVTLPkHa09o EkuXlJTTWx+L5FvXrBHqJ5xv2ssITo0wAbiOAFz4NjIkPB7qVSH892VRH1SbCCBpS4V66GtrA TtYGL0zNzY0VoucvHjhVSwV4b+E5OEQmRcjryewylFfkgZF6hj4+dIud13ydYkaKTXlP/sTJ0 gn2bOGq3LScHpcxyRkmNzY5V4cpo0iNjvwAUnnhd00Yxs0OrliGoiDCvr65NMtafV1jxt4sOt il0R9kDkjLZUX/Ss0WREfWx1jGt6JyWxReIICukWpQNZTvEpNQI3iK2KP7vRvsocjNCDq1Xt6 Q573lOJ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 6 Nov 2015 12:03:46 +0100 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 --- drivers/gpu/drm/drm_atomic.c | 9 +++------ drivers/gpu/drm/drm_atomic_helper.c | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 7bb3845..d65dc31 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, if (mode && memcmp(&state->mode, mode, sizeof(*mode)) == 0) return 0; - if (state->mode_blob) - drm_property_unreference_blob(state->mode_blob); + drm_property_unreference_blob(state->mode_blob); state->mode_blob = NULL; if (mode) { @@ -363,8 +362,7 @@ int drm_atomic_set_mode_prop_for_crtc(struct drm_crtc_state *state, if (blob == state->mode_blob) return 0; - if (state->mode_blob) - drm_property_unreference_blob(state->mode_blob); + drm_property_unreference_blob(state->mode_blob); state->mode_blob = NULL; if (blob) { @@ -419,8 +417,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, struct drm_property_blob *mode = drm_property_lookup_blob(dev, val); ret = drm_atomic_set_mode_prop_for_crtc(state, mode); - if (mode) - drm_property_unreference_blob(mode); + drm_property_unreference_blob(mode); return ret; } else if (crtc->funcs->atomic_set_property) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 0c6f621..9870c70 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2173,7 +2173,7 @@ EXPORT_SYMBOL(drm_atomic_helper_connector_dpms); */ void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc) { - if (crtc->state && crtc->state->mode_blob) + if (crtc->state) drm_property_unreference_blob(crtc->state->mode_blob); kfree(crtc->state); crtc->state = kzalloc(sizeof(*crtc->state), GFP_KERNEL); @@ -2241,8 +2241,7 @@ EXPORT_SYMBOL(drm_atomic_helper_crtc_duplicate_state); void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state) { - if (state->mode_blob) - drm_property_unreference_blob(state->mode_blob); + drm_property_unreference_blob(state->mode_blob); } EXPORT_SYMBOL(__drm_atomic_helper_crtc_destroy_state); -- 2.6.2