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;
Message-ID: <0f352a00-88ea-ab17-7a6f-3d8f32c70ce3@amd.com>
Date:   Thu, 24 Nov 2022 16:00:15 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.5.0
Subject: Re: [PATCH] drm/amdgpu: remove redundant NULL check
Content-Language: en-CA
To:     zys.zljxml@gmail.com, alexander.deucher@amd.com,
        christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com,
        daniel@ffwll.ch
Cc:     Yushan Zhou <katrinzhou@tencent.com>,
        dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
References: <20221123074437.1841014-1-zys.zljxml@gmail.com>
From:   Luben Tuikov <luben.tuikov@amd.com>
In-Reply-To: <20221123074437.1841014-1-zys.zljxml@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cmM4TUFIYmNMQ0JzT3BDSHNIdFNFUzNUSyttT2dFSlB3QVc1aGNqVUdVeWI5?=
 =?utf-8?B?UmtSTUIwak9jaERNKzVQOURZcWtaUStORExZUVgxOU9QV3IyTmtmUU1VQk9Y?=
 =?utf-8?B?OC9aNURQc2tMUFg3dnhHK0FGVyt4cWpvTW5tVllXc1ZvblRac1p4RHAxdUZV?=
 =?utf-8?B?bEdoMFgyTk9yUHErNVZsOVFKZU9PK2lWRFFBR2sybzV1eXFLUmpaR0tBb2d2?=
 =?utf-8?B?UXp0ZlRhbDl6U01EUU9kOVBKTW9iREdJUGd5NWFRWlhVQllVYzUxdHRIc3dF?=
 =?utf-8?B?U2kydDRLcERhUFZWMWhRV3BKZEl2am9FT3NUbzloc0NxNDRxVXpZTi9kTHVI?=
 =?utf-8?B?M1B0VURHQkhmUWM3YlNmbkFkUVI1UGVXZmw0NGNzTzlyZUNicWgwVmtkeHQx?=
 =?utf-8?B?Y2ovbnpZR05KZ1EzNWROemN5WkNvVGVsWkdXTGJNYXEwbm1qS2QyZDlGTTB3?=
 =?utf-8?B?bnpjUzQyUFV2cDVHWDJLUW5MVE9YRGpVQ1U3OFB0akw3UDkxZDdLMGcvSW9K?=
 =?utf-8?B?YzdjZ0E2QU1KYitKM25kOVltYzlxZ251T2djOVpHWlg5UUlad1RCL1ZWTFZY?=
 =?utf-8?B?RXlkbjFEUGV5dTFvbUQ4Z01KaEpsNVVoK3R0bHZCckxjYU5FUjNMM2lmVXhV?=
 =?utf-8?B?RVFoYlFhS0hzbW1GLy9rb3AvL0ZEY0NRcytKMjZwbEpRMUFjWDlhZHRnTmcz?=
 =?utf-8?B?bFNYYThqY3ZrQm5jM3dzaFZWWDVqanRCUFRCbXBWbjQ1V09mblJGckc2d29i?=
 =?utf-8?B?WUkyRVFzeEFnUUE5Q09TbE5wYmJ5SHJTNGdDT05PUkIxdHdKQjhBM2NUdk45?=
 =?utf-8?B?SWZGV1BpSHQ5N1hPSVpFWHFZUHk5ang3WGNDM05QS2pZZVBCcjFlOUYvdnFY?=
 =?utf-8?B?OHRZSlpwKzRxQnJ0TE1hc3JKWkRKY3lLN0p4N2p6SGtSaDhVa3ovcEtaOWtp?=
 =?utf-8?B?TXpkRDVXN1l2Szc4cndNT21RQWpORlVHNlo4YVFuZmpJVFFKdkpVNm5NbFlR?=
 =?utf-8?B?cUFhUWhjQkVEWk1hU3lNYlhVTFA3Rm1CNzJrQ2JZZHlFN05Cd3IvbUlBeVBD?=
 =?utf-8?B?YXNWTW1GYmEzbnBGUitMLy84YTJSeDZrOTNMM2RlYnZROUtMbnZUNmU5ZHpS?=
 =?utf-8?B?aTk2eHRJQTZNaDNORzZ3akxBaE1BK3NCOGVNY1VFSGpGV2NUbUk4cFZ2LzVR?=
 =?utf-8?B?dDhMVDNUYnFZTGFoTHZRTDN6YzJRdm9BaUxOZ2RFaW1jNWRtU0FSMFJMSzRN?=
 =?utf-8?B?WXgzc1dyWUtTVnBHRUhjdUwyWldoRWRqb3MzNU1sMDhZZDR3TjZoVlBPUzZ6?=
 =?utf-8?B?RndHbjBmMVdwbWhuN1d5M2lGWDhnYWxtbWxtV05EN1lFQ0daSFIyM2szSGNo?=
 =?utf-8?B?SG9STWdPVVFDL2dpZU9rSFBWemI0R0RXOVVpMGlFTWMzTXc2eHA2ZkVzNEpk?=
 =?utf-8?B?V1hHcG1jaGdtYmZkQnhlUFNMMmpLZU1DZnFBZlFXVCs5S2lxamV3MW9tKzBU?=
 =?utf-8?B?UVdHQjVGRWRMdmp1WHFYTDlZbnorbVN2NlgxK3ZWcXlrTWw5VXZ3S3E1VW9z?=
 =?utf-8?B?akZSSi9ReThwVDh0RnJoL3JhVEQxOE10cmJhdXloMlJ1SDBoazVLdWZvR0JG?=
 =?utf-8?B?elVWbzhrU0xMUUc3bWRPUHJVcmxGZE80OE9nZUNCZld6T2kzV1l4TGZqQk1Y?=
 =?utf-8?B?NkozcEViVVlMWWJJT29zVUVnVlY1WGhJRnlZeDR3S0JsYU1ubGxVTE1uWGJq?=
 =?utf-8?B?N01KMUVDQTA1cDRyOW0rTVpFeHNqaFZrT0ZKditvSE5HWmtOVjBucjVlUWND?=
 =?utf-8?B?Z1FNYUtWVXVtZ2F0SVNWVzlObkhISk90Z1c1L2ZQNFFDdEk3aUdlNm9iMnVI?=
 =?utf-8?B?bjV1NnVvMzB2b3FJV1NJMlpKdmdhN1c5aFV1b1l2b0JCNzd2OVhZQUliSW1h?=
 =?utf-8?B?bUcvNGg1M1hSUlFnUEVyV3V6cnBUdnB1THhuRUFscTRUdEtCcEtVRWRHSHlj?=
 =?utf-8?B?NDNyK2tsdjBTMldTSklVcVFFaEJ5Zm9Pa0hISE9tbXRpaTJzWEY5Mm5haVN5?=
 =?utf-8?B?SWw2Z2E4MVo1R0J4dHJEcXI1dHZTT28xanRncUpyOEhMT0Q5bWVBdXBHWWtC?=
 =?utf-8?Q?d5sVCPmRvYk6GN3GOYpPNJzGp?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 222b646f-10cb-4467-9dab-08dace5ee43b
X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3370.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2022 21:00:17.9893
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: MxFCNbSfQbswh+Rk5obpyUWqyV7ih3Qq3NdHoGsTeufpabvYX8RMpVUNsKZr+j0H
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5252
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Applied.

Thanks,
Luben

On 2022-11-23 02:44, zys.zljxml@gmail.com wrote:
> From: Yushan Zhou <katrinzhou@tencent.com>
> 
> release_firmware() checks whether firmware pointer is NULL.
> Remove the redundant NULL check in psp_sw_fini().
> 
> Signed-off-by: Yushan Zhou <katrinzhou@tencent.com>
> ---
>  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);