projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[deliverable/linux.git]
/
drivers
/
iommu
/
arm-smmu-v3.c
diff --git
a/drivers/iommu/arm-smmu-v3.c
b/drivers/iommu/arm-smmu-v3.c
index ebab33e77d6729d5f3d2450d42761355f7cd29b8..94b68213c50dae945b9c0789afe8b6465dfd5411 100644
(file)
--- a/
drivers/iommu/arm-smmu-v3.c
+++ b/
drivers/iommu/arm-smmu-v3.c
@@
-1477,7
+1477,7
@@
static int arm_smmu_domain_finalise_s1(struct arm_smmu_domain *smmu_domain,
struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg;
asid = arm_smmu_bitmap_alloc(smmu->asid_map, smmu->asid_bits);
struct arm_smmu_s1_cfg *cfg = &smmu_domain->s1_cfg;
asid = arm_smmu_bitmap_alloc(smmu->asid_map, smmu->asid_bits);
- if (
IS_ERR_VALUE(asid)
)
+ if (
asid < 0
)
return asid;
cfg->cdptr = dmam_alloc_coherent(smmu->dev, CTXDESC_CD_DWORDS << 3,
return asid;
cfg->cdptr = dmam_alloc_coherent(smmu->dev, CTXDESC_CD_DWORDS << 3,
@@
-1508,7
+1508,7
@@
static int arm_smmu_domain_finalise_s2(struct arm_smmu_domain *smmu_domain,
struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg;
vmid = arm_smmu_bitmap_alloc(smmu->vmid_map, smmu->vmid_bits);
struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg;
vmid = arm_smmu_bitmap_alloc(smmu->vmid_map, smmu->vmid_bits);
- if (
IS_ERR_VALUE(vmid)
)
+ if (
vmid < 0
)
return vmid;
cfg->vmid = (u16)vmid;
return vmid;
cfg->vmid = (u16)vmid;
@@
-1569,7
+1569,7
@@
static int arm_smmu_domain_finalise(struct iommu_domain *domain)
smmu_domain->pgtbl_ops = pgtbl_ops;
ret = finalise_stage_fn(smmu_domain, &pgtbl_cfg);
smmu_domain->pgtbl_ops = pgtbl_ops;
ret = finalise_stage_fn(smmu_domain, &pgtbl_cfg);
- if (
IS_ERR_VALUE(ret)
)
+ if (
ret < 0
)
free_io_pgtable_ops(pgtbl_ops);
return ret;
free_io_pgtable_ops(pgtbl_ops);
return ret;
@@
-1642,7
+1642,7
@@
static void arm_smmu_detach_dev(struct device *dev)
struct arm_smmu_group *smmu_group = arm_smmu_group_get(dev);
smmu_group->ste.bypass = true;
struct arm_smmu_group *smmu_group = arm_smmu_group_get(dev);
smmu_group->ste.bypass = true;
- if (
IS_ERR_VALUE(arm_smmu_install_ste_for_group(smmu_group))
)
+ if (
arm_smmu_install_ste_for_group(smmu_group) < 0
)
dev_warn(dev, "failed to install bypass STE\n");
smmu_group->domain = NULL;
dev_warn(dev, "failed to install bypass STE\n");
smmu_group->domain = NULL;
@@
-1694,7
+1694,7
@@
static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
smmu_group->ste.bypass = domain->type == IOMMU_DOMAIN_DMA;
ret = arm_smmu_install_ste_for_group(smmu_group);
smmu_group->ste.bypass = domain->type == IOMMU_DOMAIN_DMA;
ret = arm_smmu_install_ste_for_group(smmu_group);
- if (
IS_ERR_VALUE(ret)
)
+ if (
ret < 0
)
smmu_group->domain = NULL;
out_unlock:
smmu_group->domain = NULL;
out_unlock:
@@
-2235,7
+2235,7
@@
static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
arm_smmu_evtq_handler,
arm_smmu_evtq_thread,
0, "arm-smmu-v3-evtq", smmu);
arm_smmu_evtq_handler,
arm_smmu_evtq_thread,
0, "arm-smmu-v3-evtq", smmu);
- if (
IS_ERR_VALUE(ret)
)
+ if (
ret < 0
)
dev_warn(smmu->dev, "failed to enable evtq irq\n");
}
dev_warn(smmu->dev, "failed to enable evtq irq\n");
}
@@
-2244,7
+2244,7
@@
static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
ret = devm_request_irq(smmu->dev, irq,
arm_smmu_cmdq_sync_handler, 0,
"arm-smmu-v3-cmdq-sync", smmu);
ret = devm_request_irq(smmu->dev, irq,
arm_smmu_cmdq_sync_handler, 0,
"arm-smmu-v3-cmdq-sync", smmu);
- if (
IS_ERR_VALUE(ret)
)
+ if (
ret < 0
)
dev_warn(smmu->dev, "failed to enable cmdq-sync irq\n");
}
dev_warn(smmu->dev, "failed to enable cmdq-sync irq\n");
}
@@
-2252,7
+2252,7
@@
static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
if (irq) {
ret = devm_request_irq(smmu->dev, irq, arm_smmu_gerror_handler,
0, "arm-smmu-v3-gerror", smmu);
if (irq) {
ret = devm_request_irq(smmu->dev, irq, arm_smmu_gerror_handler,
0, "arm-smmu-v3-gerror", smmu);
- if (
IS_ERR_VALUE(ret)
)
+ if (
ret < 0
)
dev_warn(smmu->dev, "failed to enable gerror irq\n");
}
dev_warn(smmu->dev, "failed to enable gerror irq\n");
}
@@
-2264,7
+2264,7
@@
static int arm_smmu_setup_irqs(struct arm_smmu_device *smmu)
arm_smmu_priq_thread,
0, "arm-smmu-v3-priq",
smmu);
arm_smmu_priq_thread,
0, "arm-smmu-v3-priq",
smmu);
- if (
IS_ERR_VALUE(ret)
)
+ if (
ret < 0
)
dev_warn(smmu->dev,
"failed to enable priq irq\n");
else
dev_warn(smmu->dev,
"failed to enable priq irq\n");
else
This page took
0.027438 seconds
and
5
git commands to generate.