OSDN Git Service

drm/amd: Remove null check before kfree
authorHimanshu Jha <himanshujha199640@gmail.com>
Tue, 29 Aug 2017 13:21:27 +0000 (18:51 +0530)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 29 Aug 2017 19:57:32 +0000 (15:57 -0400)
Kfree on NULL pointer is a no-op and therefore checking is redundant.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c

index 8d1cf2d..f51b41f 100644 (file)
@@ -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)
index c49a6f2..f128b03 100644 (file)
@@ -607,10 +607,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;
 }