Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9009e8d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qcom: scm: update function return value and input parameter type"

parents fc30a7a6 18ae3311

drivers/crypto/msm/ice.c

+3 −2
Original line number Diff line number Diff line
@@ -975,7 +975,8 @@ static int qcom_ice_secure_ice_init(struct ice_device *ice_dev) 


static int qcom_ice_update_sec_cfg(struct ice_device *ice_dev)

{

	int ret = 0, scm_ret = 0;

	int ret = 0;

	u64 scm_ret = 0;



	/* scm command buffer structure */

	struct qcom_scm_cmd_buf {
@@ -1001,7 +1002,7 @@ static int qcom_ice_update_sec_cfg(struct ice_device *ice_dev) 
	cbuf.device_id = ICE_TZ_DEV_ID;

	ret = scm_restore_sec_cfg(cbuf.device_id, cbuf.spare, &scm_ret);

	if (ret || scm_ret) {

		pr_err("%s: failed, ret %d scm_ret %d\n",

		pr_err("%s: failed, ret %d scm_ret %llu\n",

						__func__, ret, scm_ret);

		if (!ret)

			ret = scm_ret;

drivers/iommu/arm-smmu.c

+2 −1
Original line number Diff line number Diff line
@@ -1727,7 +1727,8 @@ static void arm_smmu_pgtbl_unlock(struct arm_smmu_domain *smmu_domain, 


static int arm_smmu_restore_sec_cfg(struct arm_smmu_device *smmu)

{

	int ret, scm_ret;

	int ret;

	u64 scm_ret;



	if (!arm_smmu_is_static_cb(smmu))

		return 0;

drivers/misc/qseecom.c

+3 −2
Original line number Diff line number Diff line
@@ -8434,9 +8434,10 @@ out: 
 */

static int qseecom_check_whitelist_feature(void)

{

	int version = scm_get_feat_version(FEATURE_ID_WHITELIST);

	u64 version = 0;

	int ret = scm_get_feat_version(FEATURE_ID_WHITELIST, &version);



	return version >= MAKE_WHITELIST_VERSION(1, 0, 0);

	return (ret == 0) && (version >= MAKE_WHITELIST_VERSION(1, 0, 0));

}



static int qseecom_probe(struct platform_device *pdev)

drivers/pci/host/pci-msm.c

+3 −2
Original line number Diff line number Diff line
@@ -1737,7 +1737,8 @@ static bool pcie_phy_is_ready(struct msm_pcie_dev_t *dev) 


static int msm_pcie_restore_sec_config(struct msm_pcie_dev_t *dev)

{

	int ret, scm_ret;

	int ret;

	u64 scm_ret;



	if (!dev) {

		pr_err("PCIe: the input pcie dev is NULL.\n");
@@ -1747,7 +1748,7 @@ static int msm_pcie_restore_sec_config(struct msm_pcie_dev_t *dev) 
	ret = scm_restore_sec_cfg(dev->scm_dev_id, 0, &scm_ret);

	if (ret || scm_ret) {

		PCIE_ERR(dev,

			"PCIe: RC%d failed(%d) to restore sec config, scm_ret=%d\n",

			"PCIe: RC%d failed(%d) to restore sec config, scm_ret=%llu\n",

			dev->rc_idx, ret, scm_ret);

		return ret ? ret : -EINVAL;

	}

drivers/scsi/ufs/ufs-qcom.c

+4 −3
Original line number Diff line number Diff line
@@ -2416,7 +2416,8 @@ static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba, 
 */

static int ufs_qcom_update_sec_cfg(struct ufs_hba *hba, bool restore_sec_cfg)

{

	int ret = 0, scm_ret = 0;

	int ret = 0;

	u64 scm_ret = 0;

	struct ufs_qcom_host *host = ufshcd_get_variant(hba);



	/* scm command buffer structrue */
@@ -2457,7 +2458,7 @@ static int ufs_qcom_update_sec_cfg(struct ufs_hba *hba, bool restore_sec_cfg) 
	cbuf.device_id = UFS_TZ_DEV_ID;

	ret = scm_restore_sec_cfg(cbuf.device_id, cbuf.spare, &scm_ret);

	if (ret || scm_ret) {

		dev_dbg(hba->dev, "%s: failed, ret %d scm_ret %d\n",

		dev_dbg(hba->dev, "%s: failed, ret %d scm_ret %llu\n",

			__func__, ret, scm_ret);

		if (!ret)

			ret = scm_ret;
@@ -2466,7 +2467,7 @@ static int ufs_qcom_update_sec_cfg(struct ufs_hba *hba, bool restore_sec_cfg) 
	}



out:

	dev_dbg(hba->dev, "%s: ip: restore_sec_cfg %d, op: restore_sec_cfg %d, ret %d scm_ret %d\n",

	dev_dbg(hba->dev, "%s: ip: restore_sec_cfg %d, op: restore_sec_cfg %d, ret %d scm_ret %llu\n",

		__func__, restore_sec_cfg, host->sec_cfg_updated, ret, scm_ret);

	return ret;

}