Skip to content

Commit 6eabd42

Browse files
authored
media: iris: update MDT PAS load call for new API (#413)
media: iris: update MDT PAS load call for new API
2 parents 7d6324b + 16d787e commit 6eabd42

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

drivers/media/platform/qcom/iris/iris_firmware.c

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
3030
phys_addr_t mem_phys;
3131
size_t res_size;
3232
ssize_t fw_size;
33-
void *mem_virt;
3433
int ret;
3534

3635
if (strlen(fw_name) >= MAX_FIRMWARE_NAME_SIZE - 4)
@@ -66,22 +65,16 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
6665
goto err_release_fw;
6766
}
6867

69-
mem_virt = memremap(mem_phys, res_size, MEMREMAP_WC);
70-
if (!mem_virt) {
71-
ret = -ENOMEM;
72-
goto err_release_fw;
73-
}
74-
7568
ret = qcom_mdt_pas_load(ctx, firmware, fw_name, NULL);
7669
qcom_scm_pas_metadata_release(ctx);
7770
if (ret)
78-
goto err_mem_unmap;
71+
goto err_release_fw;
7972

8073
if (core->fw.iommu_domain) {
8174
ret = iommu_map(core->fw.iommu_domain, 0, mem_phys, res_size,
8275
IOMMU_READ | IOMMU_WRITE | IOMMU_PRIV, GFP_KERNEL);
8376
if (ret)
84-
goto err_mem_unmap;
77+
goto err_release_fw;
8578
}
8679

8780
ret = qcom_scm_pas_prepare_and_auth_reset(ctx);
@@ -94,8 +87,6 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name)
9487

9588
err_iommu_unmap:
9689
iommu_unmap(core->fw.iommu_domain, 0, res_size);
97-
err_mem_unmap:
98-
memunmap(mem_virt);
9990
err_release_fw:
10091
release_firmware(firmware);
10192

0 commit comments

Comments
 (0)