Merge "firmware: qcom-scm: Convert a few noretry calls to regular calls"
This commit is contained in:
commit
11ad9dcdfd
1 changed files with 3 additions and 3 deletions
|
|
@ -1962,7 +1962,7 @@ int qcom_scm_config_set_ice_key(uint32_t index, phys_addr_t paddr, size_t size,
|
|||
QCOM_SCM_VAL, QCOM_SCM_VAL),
|
||||
};
|
||||
|
||||
return qcom_scm_call_noretry(__scm->dev, &desc, NULL);
|
||||
return qcom_scm_call(__scm->dev, &desc, NULL);
|
||||
}
|
||||
EXPORT_SYMBOL(qcom_scm_config_set_ice_key);
|
||||
|
||||
|
|
@ -1977,7 +1977,7 @@ int qcom_scm_clear_ice_key(uint32_t index, unsigned int ce)
|
|||
.arginfo = QCOM_SCM_ARGS(2),
|
||||
};
|
||||
|
||||
return qcom_scm_call_noretry(__scm->dev, &desc, NULL);
|
||||
return qcom_scm_call(__scm->dev, &desc, NULL);
|
||||
}
|
||||
EXPORT_SYMBOL(qcom_scm_clear_ice_key);
|
||||
|
||||
|
|
@ -1996,7 +1996,7 @@ int qcom_scm_derive_raw_secret(phys_addr_t paddr_key, size_t size_key,
|
|||
desc.args[3] = size_secret;
|
||||
desc.arginfo = QCOM_SCM_ARGS(4, QCOM_SCM_RW, QCOM_SCM_VAL,
|
||||
QCOM_SCM_RW, QCOM_SCM_VAL);
|
||||
return qcom_scm_call_noretry(__scm->dev, &desc, NULL);
|
||||
return qcom_scm_call(__scm->dev, &desc, NULL);
|
||||
}
|
||||
EXPORT_SYMBOL(qcom_scm_derive_raw_secret);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue