From patchwork Wed Nov 23 07:44:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katrin Jo X-Patchwork-Id: 24756 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2648278wrr; Tue, 22 Nov 2022 23:50:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf79b6QphmQOT10QYhtsT5c5baAqnHYKCTS1AJxjfYbo0ieyrOK43c16uGmX4LnIqlQM6UoY X-Received: by 2002:a17:902:efcf:b0:186:ba54:f340 with SMTP id ja15-20020a170902efcf00b00186ba54f340mr16789628plb.119.1669189802115; Tue, 22 Nov 2022 23:50:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669189802; cv=none; d=google.com; s=arc-20160816; b=DEVMXaIFg7MtQT4Z8Wr6z230BP22cPT8uHBe1HoAuXZMuyDXYqxJQOXyz6c56UaNMn 1tbmF+7pK6v+mUh+zGsQZ4fORCU4//8LDErSoeAtO7CgxTd5bBoSpYRnJ8Pk/bxBRNxc egTdQo+k4rw/6wJVeRgS8LOxgpt0VUVYwbt4l7zAKYWuKSNT+GNp67w8SM9eZjOfMfH5 fq7TbjpU7Ko+Ll51X2Rg/XXdxtW4rAmJ7bi2f28t7u9Qt3iAPknHwG+yVf4pElX4Nsbb nGpOuiLBepdFpqpc6fqj7b0o1Rnjti1gPQX4dq66JziaI5DNkD3rovA93riLhfakgloq KsWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=DkNCuvzVKZTIBNAMLhyXJqvNV8XoAxmEaDHLKjpaxZk=; b=HINfAKM7lrUeO1ukd9W+z5QoBS0IKDqXsvJbWIHQkvsAXvhD36bTk5ftFgq9pqGAY8 E63pVCBkYzuVRJvCLPmD09uu+LJcwJ+KYRjkfU2bP7+sMlwXBiQfRdXNsnBC//W+U7wS T+5/Kq7/+d17gFSz4cbcmyECeDOBfsxrHkNag5Klcxd+NG9f1NZmQKjG3PDqkyCGpkkj QaYMYYD7UVnLRIXSBGqUp7nrFbkiLXNnOrrImCIHkmGZ4qJ+RZ7UcQAu58BhnI0rlazG T4zpSqK/TCLKy3eRtv8A8NaPL49lZOaEbQObVY6Bi/9po5XhBovlm6y/UqnGyhe/LaB+ EPnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GIZt1ORB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e11-20020a056a001a8b00b0056b8bbfe687si17456372pfv.171.2022.11.22.23.49.48; Tue, 22 Nov 2022 23:50:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GIZt1ORB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235946AbiKWHo4 (ORCPT + 99 others); Wed, 23 Nov 2022 02:44:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234911AbiKWHoy (ORCPT ); Wed, 23 Nov 2022 02:44:54 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D995CF72C5 for ; Tue, 22 Nov 2022 23:44:53 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso1235248pjt.0 for ; Tue, 22 Nov 2022 23:44:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DkNCuvzVKZTIBNAMLhyXJqvNV8XoAxmEaDHLKjpaxZk=; b=GIZt1ORBmaG7n9RolwWkJ49wmMDAqSAEdkZa8bbfIDHYwD7sXZ5/XEVMkrDHclYtz2 hhoMoHNj7Y+Mmh577ISuaMfObcYKtff0K5UFEBv1HUMsUl4g8q4atXrN4jWDmw4GrQZk m8p8q+ZvAWyb3GLIY1EMqlGI5EvucKfaalL/3RVjz4mcJzzKdqUwKrALJl69n4Rpi9bW VY54dSqKoGj6mF9EzI0t6Wo6GK64PWy2CCKzTH8n1VVRJGoNoSq76mKwj4h1ptCcfhjn H4ZSYewVbLviJZWghcZqHwaGu8e3L1DJDj8eyHHQtEBRFXvJeFPsg+C23QdYTOGIqK1z Fx4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DkNCuvzVKZTIBNAMLhyXJqvNV8XoAxmEaDHLKjpaxZk=; b=wfAev0TpW5Nh3d6nZTQALEIZG4ajF1lNQF93bn/RisQrUB+bLKu9DUd1Kp+MRIeP3Q fq/Mjg6w7rYX5gnDmeyuIlG4aa5D7Sw12+/8JvDOwupTsh3uNfz3g3TQa7+HYZDmmv6O KOxm1UT951NWgxDyT/4AP+q+UI7nEuFLWsUVWGvPC5C+061pA49IkOugLL54d74mr0o+ 9PHhfmOujm3w0T2Upj2KmpBaRyfPBJ2CCGscBEljuQQZxvys/z8Gj1fWHnH3H5n3Dkwu VnEYaoNGI67jgFBvqF/oEi1eW7CKtBFAV3V72SXE0b691DeSDqBjMCsW4bGi32JlRieF 4xVw== X-Gm-Message-State: ANoB5pm3zyNjf+9abqz5aK8JQw1h/DsX/kUd3VrYk077ibcJkL8UmUaO 3kepnvgyGAszmaRnxACd5AQ= X-Received: by 2002:a17:902:b691:b0:17e:3f0f:5ad0 with SMTP id c17-20020a170902b69100b0017e3f0f5ad0mr12056528pls.162.1669189493415; Tue, 22 Nov 2022 23:44:53 -0800 (PST) Received: from localhost.localdomain ([43.132.141.9]) by smtp.gmail.com with ESMTPSA id u3-20020a170902714300b00188f07c9eedsm13290823plm.176.2022.11.22.23.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 23:44:52 -0800 (PST) From: zys.zljxml@gmail.com To: alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yushan Zhou Subject: [PATCH] drm/amdgpu: remove redundant NULL check Date: Wed, 23 Nov 2022 15:44:37 +0800 Message-Id: <20221123074437.1841014-1-zys.zljxml@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,HK_RANDOM_ENVFROM, HK_RANDOM_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750272366111694174?= X-GMAIL-MSGID: =?utf-8?q?1750272366111694174?= From: Yushan Zhou release_firmware() checks whether firmware pointer is NULL. Remove the redundant NULL check in psp_sw_fini(). Signed-off-by: Yushan Zhou --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 36 +++++++++++-------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c index effa7df3ddbf..77b966ab5439 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -484,26 +484,22 @@ static int psp_sw_fini(void *handle) struct psp_gfx_cmd_resp *cmd = psp->cmd; psp_memory_training_fini(psp); - if (psp->sos_fw) { - release_firmware(psp->sos_fw); - psp->sos_fw = NULL; - } - if (psp->asd_fw) { - release_firmware(psp->asd_fw); - psp->asd_fw = NULL; - } - if (psp->ta_fw) { - release_firmware(psp->ta_fw); - psp->ta_fw = NULL; - } - if (psp->cap_fw) { - release_firmware(psp->cap_fw); - psp->cap_fw = NULL; - } - if (psp->toc_fw) { - release_firmware(psp->toc_fw); - psp->toc_fw = NULL; - } + + release_firmware(psp->sos_fw); + psp->sos_fw = NULL; + + release_firmware(psp->asd_fw); + psp->asd_fw = NULL; + + release_firmware(psp->ta_fw); + psp->ta_fw = NULL; + + release_firmware(psp->cap_fw); + psp->cap_fw = NULL; + + release_firmware(psp->toc_fw); + psp->toc_fw = NULL; + if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 0) || adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 7)) psp_sysfs_fini(adev);