drm/amd/display: remove no need NULL check before kfree
authorBernard Zhao <bernard@vivo.com>
Tue, 16 Nov 2021 01:47:50 +0000 (17:47 -0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 22 Nov 2021 19:45:03 +0000 (14:45 -0500)
This change is to cleanup the code a bit.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Bernard Zhao <bernard@vivo.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c

index f37551e00023fa11c8ab1b2a2e11ef8ed59f8f9f..0090550d4aeeea77cb73c03043f041dbb54634cd 100644 (file)
@@ -978,10 +978,8 @@ static void dcn10_resource_destruct(struct dcn10_resource_pool *pool)
                pool->base.mpc = NULL;
        }
 
-       if (pool->base.hubbub != NULL) {
-               kfree(pool->base.hubbub);
-               pool->base.hubbub = NULL;
-       }
+       kfree(pool->base.hubbub);
+       pool->base.hubbub = NULL;
 
        for (i = 0; i < pool->base.pipe_count; i++) {
                if (pool->base.opps[i] != NULL)
@@ -1011,14 +1009,10 @@ static void dcn10_resource_destruct(struct dcn10_resource_pool *pool)
        for (i = 0; i < pool->base.res_cap->num_ddc; i++) {
                if (pool->base.engines[i] != NULL)
                        dce110_engine_destroy(&pool->base.engines[i]);
-               if (pool->base.hw_i2cs[i] != NULL) {
-                       kfree(pool->base.hw_i2cs[i]);
-                       pool->base.hw_i2cs[i] = NULL;
-               }
-               if (pool->base.sw_i2cs[i] != NULL) {
-                       kfree(pool->base.sw_i2cs[i]);
-                       pool->base.sw_i2cs[i] = NULL;
-               }
+               kfree(pool->base.hw_i2cs[i]);
+               pool->base.hw_i2cs[i] = NULL;
+               kfree(pool->base.sw_i2cs[i]);
+               pool->base.sw_i2cs[i] = NULL;
        }
 
        for (i = 0; i < pool->base.audio_count; i++) {