Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753927AbdH2NVr (ORCPT ); Tue, 29 Aug 2017 09:21:47 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35892 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753779AbdH2NVq (ORCPT ); Tue, 29 Aug 2017 09:21:46 -0400 X-Google-Smtp-Source: ADKCNb5oVHW3fIGePdpyUWOwIbWoyOFaRTcT7J29rXfDK4oO8h+hsA16IzCQhsKdD2+JTCJzvjMUIg== From: Himanshu Jha To: airlied@linux.ie Cc: alexander.deucher@amd.com, christian.koenig@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Himanshu Jha Subject: [PATCH] drm/amd: Remove null check before kfree Date: Tue, 29 Aug 2017 18:51:27 +0530 Message-Id: <1504012887-15147-1-git-send-email-himanshujha199640@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1568 Lines: 44 Kfree on NULL pointer is a no-op and therefore checking is redundant. Signed-off-by: Himanshu Jha --- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 ++---- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index 8d1cf2d..f51b41f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -346,10 +346,8 @@ static void amdgpu_connector_free_edid(struct drm_connector *connector) { struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); - if (amdgpu_connector->edid) { - kfree(amdgpu_connector->edid); - amdgpu_connector->edid = NULL; - } + kfree(amdgpu_connector->edid); + amdgpu_connector->edid = NULL; } static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c index 76347ff..00075c2 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c @@ -606,10 +606,8 @@ int smu7_init(struct pp_smumgr *smumgr) int smu7_smu_fini(struct pp_smumgr *smumgr) { - if (smumgr->backend) { - kfree(smumgr->backend); - smumgr->backend = NULL; - } + kfree(smumgr->backend); + smumgr->backend = NULL; cgs_rel_firmware(smumgr->device, CGS_UCODE_ID_SMU); return 0; } -- 2.7.4