Эх сурвалжийг харах

Merge "msm: camera: icp: Suppress warning messages when requesting FW" into camera-kernel.lnx.5.0

Haritha Chintalapati 4 жил өмнө
parent
commit
a494005f93

+ 2 - 2
drivers/cam_icp/icp_hw/a5_hw/a5_core.c

@@ -78,14 +78,14 @@ static int32_t cam_a5_download_fw(void *device_priv)
 	if (cam_a5_soc_info->fw_name) {
 		CAM_INFO(CAM_ICP, "Downloading firmware %s",
 			cam_a5_soc_info->fw_name);
-		rc = request_firmware(&core_info->fw_elf,
+		rc = firmware_request_nowarn(&core_info->fw_elf,
 				cam_a5_soc_info->fw_name, &pdev->dev);
 		if (rc) {
 			CAM_ERR(CAM_ICP, "Failed to locate fw: %d", rc);
 			return rc;
 		}
 	} else {
-		rc = request_firmware(&core_info->fw_elf,
+		rc = firmware_request_nowarn(&core_info->fw_elf,
 				"CAMERA_ICP.elf", &pdev->dev);
 		if (rc) {
 			CAM_ERR(CAM_ICP, "Failed to locate fw: %d", rc);

+ 2 - 2
drivers/cam_icp/icp_hw/lx7_hw/lx7_core.c

@@ -428,7 +428,7 @@ static int32_t __cam_non_sec_load_fw(void *device_priv)
 	scnprintf(firmware_name, ARRAY_SIZE(firmware_name),
 		"%s.elf", fw_name);
 
-	rc = request_firmware(&core_info->fw_params.fw_elf,
+	rc = firmware_request_nowarn(&core_info->fw_params.fw_elf,
 		firmware_name, &pdev->dev);
 	if (rc) {
 		CAM_ERR(CAM_ICP, "Failed to locate %s fw: %d",
@@ -573,7 +573,7 @@ static int __load_firmware(struct platform_device *pdev)
 	res_start = res.start;
 	res_size = (size_t)resource_size(&res);
 
-	rc = request_firmware(&firmware, firmware_name, &pdev->dev);
+	rc = firmware_request_nowarn(&firmware, firmware_name, &pdev->dev);
 	if (rc) {
 		CAM_ERR(CAM_ICP,
 			"error requesting %s firmware rc=%d",