diff options
author | Himanshu Jha <himanshujha199640@gmail.com> | 2017-08-29 09:21:27 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-08-29 15:57:32 -0400 |
commit | c5927537dd5706b17affa8aeea28c7b19c8fbb42 (patch) | |
tree | 4bcb1c9b199f032be613f02b6790dc113a8bf854 | |
parent | 3f3333f8a0e90ac26f84ed7b0aa344efce695c08 (diff) |
drm/amd: Remove null check before kfree
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>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 6 | ||||
-rw-r--r-- | 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 8d1cf2d3e663..f51b41f094ef 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) | |||
346 | { | 346 | { |
347 | struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); | 347 | struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); |
348 | 348 | ||
349 | if (amdgpu_connector->edid) { | 349 | kfree(amdgpu_connector->edid); |
350 | kfree(amdgpu_connector->edid); | 350 | amdgpu_connector->edid = NULL; |
351 | amdgpu_connector->edid = NULL; | ||
352 | } | ||
353 | } | 351 | } |
354 | 352 | ||
355 | static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) | 353 | 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 c49a6f22002f..f128b03f2327 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | |||
@@ -607,10 +607,8 @@ int smu7_init(struct pp_smumgr *smumgr) | |||
607 | 607 | ||
608 | int smu7_smu_fini(struct pp_smumgr *smumgr) | 608 | int smu7_smu_fini(struct pp_smumgr *smumgr) |
609 | { | 609 | { |
610 | if (smumgr->backend) { | 610 | kfree(smumgr->backend); |
611 | kfree(smumgr->backend); | 611 | smumgr->backend = NULL; |
612 | smumgr->backend = NULL; | ||
613 | } | ||
614 | cgs_rel_firmware(smumgr->device, CGS_UCODE_ID_SMU); | 612 | cgs_rel_firmware(smumgr->device, CGS_UCODE_ID_SMU); |
615 | return 0; | 613 | return 0; |
616 | } | 614 | } |