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

Commit 67560edc authored by Will Deacon's avatar Will Deacon
Browse files

iommu/arm-smmu-v3: Make arm_smmu_install_ste_for_dev return void 



arm_smmu_install_ste_for_dev cannot fail and always returns 0, however
the fact that it returns int means that callers end up implementing
redundant error handling code which complicates STE tracking and is
never executed.

This patch changes the return type of arm_smmu_install_ste_for_dev
to void, to make it explicit that it cannot fail.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 61bc6711

drivers/iommu/arm-smmu-v3.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -1579,7 +1579,7 @@ static __le64 *arm_smmu_get_step_for_sid(struct arm_smmu_device *smmu, u32 sid) 
	return step;

	return step;

}

}





static int arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)

static void arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec)

{

{

	int i;

	int i;

	struct arm_smmu_master_data *master = fwspec->iommu_priv;

	struct arm_smmu_master_data *master = fwspec->iommu_priv;
@@ -1591,8 +1591,6 @@ static int arm_smmu_install_ste_for_dev(struct iommu_fwspec *fwspec) 




		arm_smmu_write_strtab_ent(smmu, sid, step, &master->ste);

		arm_smmu_write_strtab_ent(smmu, sid, step, &master->ste);

	}

	}



	return 0;

}

}





static void arm_smmu_detach_dev(struct device *dev)

static void arm_smmu_detach_dev(struct device *dev)
@@ -1600,8 +1598,7 @@ static void arm_smmu_detach_dev(struct device *dev) 
	struct arm_smmu_master_data *master = dev->iommu_fwspec->iommu_priv;

	struct arm_smmu_master_data *master = dev->iommu_fwspec->iommu_priv;





	master->ste.bypass = true;

	master->ste.bypass = true;

	if (arm_smmu_install_ste_for_dev(dev->iommu_fwspec) < 0)

	arm_smmu_install_ste_for_dev(dev->iommu_fwspec);

		dev_warn(dev, "failed to install bypass STE\n");

}

}





static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)

static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
@@ -1653,10 +1650,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) 
		ste->s2_cfg = &smmu_domain->s2_cfg;

		ste->s2_cfg = &smmu_domain->s2_cfg;

	}

	}





	ret = arm_smmu_install_ste_for_dev(dev->iommu_fwspec);

	arm_smmu_install_ste_for_dev(dev->iommu_fwspec);

	if (ret < 0)

		ste->valid = false;



out_unlock:

out_unlock:

	mutex_unlock(&smmu_domain->init_mutex);

	mutex_unlock(&smmu_domain->init_mutex);

	return ret;

	return ret;