summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/arm-smmu-v3.c
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2019-12-19 12:03:49 +0000
committerJoerg Roedel <jroedel@suse.de>2019-12-23 14:06:05 +0100
commit2852ad05e3e9c97bfd14f1f480ee45128424c143 (patch)
treef6acec6068abf15a336e0ea35c30dd1fcf6b8dc1 /drivers/iommu/arm-smmu-v3.c
parentd3daf66621b9dd5749d4661ace74afb84d3d465e (diff)
iommu/arm-smmu-v3: Allow building as a module
By removing the redundant call to 'pci_request_acs()' we can allow the ARM SMMUv3 driver to be built as a module. Signed-off-by: Will Deacon <will@kernel.org> Tested-by: John Garry <john.garry@huawei.com> # smmu v3 Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/arm-smmu-v3.c')
-rw-r--r--drivers/iommu/arm-smmu-v3.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index da9474a02668..2a65d9b87125 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -2733,6 +2733,7 @@ static struct iommu_ops arm_smmu_ops = {
.get_resv_regions = arm_smmu_get_resv_regions,
.put_resv_regions = arm_smmu_put_resv_regions,
.pgsize_bitmap = -1UL, /* Restricted during device attach */
+ .owner = THIS_MODULE,
};
/* Probing and initialisation functions */
@@ -3571,8 +3572,6 @@ static int arm_smmu_set_bus_ops(struct iommu_ops *ops)
#ifdef CONFIG_PCI
if (pci_bus_type.iommu_ops != ops) {
- if (ops)
- pci_request_acs();
err = bus_set_iommu(&pci_bus_type, ops);
if (err)
return err;