From:   Bernard Zhao <bernard@vivo.com>
To:     Harry Wentland <harry.wentland@amd.com>,
        Leo Li <sunpeng.li@amd.com>,
        Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        Solomon Chiu <solomon.chiu@amd.com>,
        "Li, Roman" <Roman.Li@amd.com>,
        Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>,
        Eric Bernstein <Eric.Bernstein@amd.com>,
        Bernard Zhao <bernard@vivo.com>,
        Atufa Khan <Atufa.Khan@amd.com>,
        Jimmy Kizito <Jimmy.Kizito@amd.com>,
        amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] drm/amd/display: remove no need NULL check before kfree
Date:   Mon, 15 Nov 2021 17:47:50 -0800
Message-Id: <20211116014752.26868-1-bernard@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1CmVtjrSpRghPDV8JDYd2mOJ3XXdRZik5d65DpE5QHJa8UF2C0OKChF4aH07?=
 =?us-ascii?Q?A0G5m6I82cBrLXPsbpjhTLkvz9RZv3CNhstyVIzaTEXk/6PI6WziZccqvogB?=
 =?us-ascii?Q?/5NT8+zb86Xr2/gA6LM00zrsNLwh0PrS8reKy9TyKtXKmoPfwMNPlE8MFIhE?=
 =?us-ascii?Q?pmtMjp0ikQ1quBqTM7Gl2JwsCT0sgCgmK5X6znFaXlugqSn1OEMgOOzYoVkj?=
 =?us-ascii?Q?zWGENB5MHX+oM+KDfzR1tfidRes7k5DUgkT+PR7ZyN+2F2Xp6+FZf1cxO2wc?=
 =?us-ascii?Q?mlTODjJ3SF0d4oyZ94weip1OR+ra4m3/v/6PkbOAsLFHhmbiFWGEEpoZOW4i?=
 =?us-ascii?Q?y3FmKoE+rdID6MzFKy5aP9FK+ClV3DuQr1wTc6+w8SLHzRBb6G8ATqmpDYey?=
 =?us-ascii?Q?3f7Z8IZsXsAHQ5zDHck7WVCFwqZXZY2Kem4HMnx/f5b9EF3lQSG1V3rXx+Iz?=
 =?us-ascii?Q?wcRBxEm49InZic3poHTqBd7N+l0tqRiIz3en90vG03OodgxOqex50soLLOKo?=
 =?us-ascii?Q?xSMKORFKl8LU6CqiOKzbJnMGu+bgUlRBPpkF8BJDAqsjaqL+Cn7mij8UlP8J?=
 =?us-ascii?Q?9lgdEtpUsaZB/HMz9PBQgOMAfC7Sw1ir/XGpAPSFRe4dbrmwFJXuHk9Q5s15?=
 =?us-ascii?Q?d7WPqJJBpVwXFiGzYkDf9+W4mZM2rW6V+VY7mqWnnwuS6e4ai2g8s4+P26tf?=
 =?us-ascii?Q?fMWmLE13EbEgmVggT/wPi2/zahA3YkxBPSDEC4gvkTkMPrUyf2vZh8Lp4NzB?=
 =?us-ascii?Q?WhZiPxbv/ge/YF8+bZbUXXOzrtVJh685KPOwROMhgbheHb+fMJQB9SpQNzU6?=
 =?us-ascii?Q?HN+N+s5VBHCvQf/PexJjpqtnlUhdMmsqV/UDE0wHBhLt2Y2HK8ztLPS737Ay?=
 =?us-ascii?Q?aWb5PSQcg8FOWsa8OGSDUI/hivYmafhsZh+c/2fWzXhdQEdrcckpfsdWr4ch?=
 =?us-ascii?Q?VqIZAmAU3inJCTFjD3hrHlaFkdmts7fs1OCSKZY0qL6CZr+3TzE8OVuLIfBC?=
 =?us-ascii?Q?I6muN1Yuoj4MR0lMk0arB+XiGdtJYBeQNRUQ18vhqa+a1Z/LOfIm3xD3B2jE?=
 =?us-ascii?Q?wyycV3WDTcT4P+M9iUCF7YW3/PDmyXQa4JQ/NUTf/tYu79Eb7n1h9TDSHKvj?=
 =?us-ascii?Q?sa2OlkAxBavFXL1bGWl/RAkwAiNoNkR4jPRh87zNQwFgT4vWN/TvyI23pA0B?=
 =?us-ascii?Q?dhVyrOw5vrVI8NvUmBU/KKj5TbP9uKbJK1fpozavF5PJ+dXAjwfJnpoSYodN?=
 =?us-ascii?Q?iNOSiUvOOfy+KtlRty7OkZL91uQmpLjuwaGzhIRBHT4U9MOMIR/vljp9eQL/?=
 =?us-ascii?Q?emk5h3GMp2xphlyPuBXHlbOJrmSAVsePKVmaQbDoYL6QpUpED8DCdChz8i/G?=
 =?us-ascii?Q?6tEt2lPvDxM7a1sJH3L1F8BMuUD0lAjRZjuFrIHEAzrE6Sy+EDuQLwXf45qi?=
 =?us-ascii?Q?5jG3nD9/NrLfwTAmWwOoR+SHLjLLYZ6tQ/MfHFoDH2D0JkcTgYN3PWpJVXg4?=
 =?us-ascii?Q?CXqeKwE+YDnZLYxGhBiHMXL8GI9681hLfo/CdX7wx5Ktebj1TPeS3SlZxqNu?=
 =?us-ascii?Q?qyS03CQink7jG1f1Zo43AGi874SXWCL2QI3RulYurSdf+JUke6jCnw8pyUq/?=
 =?us-ascii?Q?BCk8DyWgH65ebLl7JRLj5wo=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e1feb11a-a4de-48e5-10f3-08d9a8a3223b
X-MS-Exchange-CrossTenant-AuthSource: PSAPR06MB4021.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2021 01:48:05.8391
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: I+738thejscLQhfsIgrLs2aHITk1EURW4ReDcaW6LfW5eOwBVo3TXtwolKx1MiDKSXWEhRYMgygWt0YS1UsWYw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR06MB2181
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This change is to cleanup the code a bit.

Signed-off-by: Bernard Zhao <bernard@vivo.com>
---
 .../drm/amd/display/dc/dcn10/dcn10_resource.c  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index f37551e00023..0090550d4aee 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -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++) {
-- 
2.33.1