mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
iommu/arm-smmu: Use devm_request_irq and devm_free_irq
Use devm_request_irq to simplify error handling path, when probe smmu device. Also devm_{request|free}_irq when init or destroy domain context. Signed-off-by: Peng Fan <van.freenix@gmail.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
parent
7c6d90e2bb
commit
bee1400445
1 changed files with 10 additions and 14 deletions
|
@ -987,8 +987,8 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
|
||||||
* handler seeing a half-initialised domain state.
|
* handler seeing a half-initialised domain state.
|
||||||
*/
|
*/
|
||||||
irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx];
|
irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx];
|
||||||
ret = request_irq(irq, arm_smmu_context_fault, IRQF_SHARED,
|
ret = devm_request_irq(smmu->dev, irq, arm_smmu_context_fault,
|
||||||
"arm-smmu-context-fault", domain);
|
IRQF_SHARED, "arm-smmu-context-fault", domain);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(smmu->dev, "failed to request context IRQ %d (%u)\n",
|
dev_err(smmu->dev, "failed to request context IRQ %d (%u)\n",
|
||||||
cfg->irptndx, irq);
|
cfg->irptndx, irq);
|
||||||
|
@ -1028,7 +1028,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
|
||||||
|
|
||||||
if (cfg->irptndx != INVALID_IRPTNDX) {
|
if (cfg->irptndx != INVALID_IRPTNDX) {
|
||||||
irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx];
|
irq = smmu->irqs[smmu->num_global_irqs + cfg->irptndx];
|
||||||
free_irq(irq, domain);
|
devm_free_irq(smmu->dev, irq, domain);
|
||||||
}
|
}
|
||||||
|
|
||||||
free_io_pgtable_ops(smmu_domain->pgtbl_ops);
|
free_io_pgtable_ops(smmu_domain->pgtbl_ops);
|
||||||
|
@ -1986,15 +1986,15 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < smmu->num_global_irqs; ++i) {
|
for (i = 0; i < smmu->num_global_irqs; ++i) {
|
||||||
err = request_irq(smmu->irqs[i],
|
err = devm_request_irq(smmu->dev, smmu->irqs[i],
|
||||||
arm_smmu_global_fault,
|
arm_smmu_global_fault,
|
||||||
IRQF_SHARED,
|
IRQF_SHARED,
|
||||||
"arm-smmu global fault",
|
"arm-smmu global fault",
|
||||||
smmu);
|
smmu);
|
||||||
if (err) {
|
if (err) {
|
||||||
dev_err(dev, "failed to request global IRQ %d (%u)\n",
|
dev_err(dev, "failed to request global IRQ %d (%u)\n",
|
||||||
i, smmu->irqs[i]);
|
i, smmu->irqs[i]);
|
||||||
goto out_free_irqs;
|
goto out_put_masters;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2006,10 +2006,6 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
|
||||||
arm_smmu_device_reset(smmu);
|
arm_smmu_device_reset(smmu);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_free_irqs:
|
|
||||||
while (i--)
|
|
||||||
free_irq(smmu->irqs[i], smmu);
|
|
||||||
|
|
||||||
out_put_masters:
|
out_put_masters:
|
||||||
for (node = rb_first(&smmu->masters); node; node = rb_next(node)) {
|
for (node = rb_first(&smmu->masters); node; node = rb_next(node)) {
|
||||||
struct arm_smmu_master *master
|
struct arm_smmu_master *master
|
||||||
|
@ -2050,7 +2046,7 @@ static int arm_smmu_device_remove(struct platform_device *pdev)
|
||||||
dev_err(dev, "removing device with active domains!\n");
|
dev_err(dev, "removing device with active domains!\n");
|
||||||
|
|
||||||
for (i = 0; i < smmu->num_global_irqs; ++i)
|
for (i = 0; i < smmu->num_global_irqs; ++i)
|
||||||
free_irq(smmu->irqs[i], smmu);
|
devm_free_irq(smmu->dev, smmu->irqs[i], smmu);
|
||||||
|
|
||||||
/* Turn the thing off */
|
/* Turn the thing off */
|
||||||
writel(sCR0_CLIENTPD, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0);
|
writel(sCR0_CLIENTPD, ARM_SMMU_GR0_NS(smmu) + ARM_SMMU_GR0_sCR0);
|
||||||
|
|
Loading…
Reference in a new issue