Commit 75e1658e authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: call release_firmware() without a NULL check 



The release_firmware() function is NULL tolerant so we do not need
to check for NULL param before calling it.

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d69fd951

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+2 −4
Original line number Diff line number Diff line
@@ -3380,10 +3380,8 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 
		amdgpu_pm_sysfs_fini(adev);

	amdgpu_fbdev_fini(adev);

	r = amdgpu_device_ip_fini(adev);

	if (adev->firmware.gpu_info_fw) {

	release_firmware(adev->firmware.gpu_info_fw);

	adev->firmware.gpu_info_fw = NULL;

	}

	adev->accel_working = false;

	/* free i2c buses */

	if (!amdgpu_device_has_dc_support(adev))

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

+2 −4
Original line number Diff line number Diff line
@@ -196,10 +196,8 @@ static int psp_sw_fini(void *handle) 
	adev->psp.sos_fw = NULL;

	release_firmware(adev->psp.asd_fw);

	adev->psp.asd_fw = NULL;

	if (adev->psp.ta_fw) {

	release_firmware(adev->psp.ta_fw);

	adev->psp.ta_fw = NULL;

	}



	if (adev->asic_type == CHIP_NAVI10)

		psp_sysfs_fini(adev);

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

+2 −2
Original line number Diff line number Diff line
@@ -559,8 +559,8 @@ static void sdma_v4_0_destroy_inst_ctx(struct amdgpu_device *adev) 
	int i;



	for (i = 0; i < adev->sdma.num_instances; i++) {

		if (adev->sdma.instance[i].fw != NULL)

		release_firmware(adev->sdma.instance[i].fw);

		adev->sdma.instance[i].fw = NULL;



		/* arcturus shares the same FW memory across

		   all SDMA isntances */

drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c

+2 −2
Original line number Diff line number Diff line
@@ -1300,8 +1300,8 @@ static int sdma_v5_0_sw_fini(void *handle) 
	int i;



	for (i = 0; i < adev->sdma.num_instances; i++) {

		if (adev->sdma.instance[i].fw != NULL)

		release_firmware(adev->sdma.instance[i].fw);

		adev->sdma.instance[i].fw = NULL;



		amdgpu_ring_fini(&adev->sdma.instance[i].ring);

	}

drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ static void sdma_v5_2_destroy_inst_ctx(struct amdgpu_device *adev) 
	int i;



	for (i = 0; i < adev->sdma.num_instances; i++) {

		if (adev->sdma.instance[i].fw != NULL)

		release_firmware(adev->sdma.instance[i].fw);

		adev->sdma.instance[i].fw = NULL;



		if (adev->asic_type == CHIP_SIENNA_CICHLID)

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE