openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI/IORT: Drop the unused @ops of iort_add_device_replay() 

Since commit d2e1a003af ("ACPI/IORT: Don't call iommu_ops->add_device
directly"), we use the IOMMU core API to replace a direct invoke of the
specified callback. The parameter @ops has therefore became unused. Let's
drop it.

Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Hanjun Guo <guohanjun@huawei.com>
Link: https://lore.kernel.org/r/20200818063625.980-2-yuzenghui@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Zenghui Yu 2020-08-18 14:36:24 +08:00 committed by Will Deacon
parent f75aef392f
commit 1ab64cf814
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/acpi/arm64/iort.c
View File

@ -811,8 +811,7 @@ static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev)
return (fwspec && fwspec->ops) ? fwspec->ops : NULL; return (fwspec && fwspec->ops) ? fwspec->ops : NULL;
} }
static inline int iort_add_device_replay(const struct iommu_ops *ops, static inline int iort_add_device_replay(struct device *dev)
struct device *dev)
{ {
int err = 0; int err = 0;
@ -1072,7 +1071,7 @@ const struct iommu_ops *iort_iommu_configure_id(struct device *dev,
*/ */
if (!err) { if (!err) {
ops = iort_fwspec_iommu_ops(dev); ops = iort_fwspec_iommu_ops(dev);
err = iort_add_device_replay(ops, dev); err = iort_add_device_replay(dev);
} }
/* Ignore all other errors apart from EPROBE_DEFER */ /* Ignore all other errors apart from EPROBE_DEFER */
@ -1089,8 +1088,7 @@ const struct iommu_ops *iort_iommu_configure_id(struct device *dev,
#else #else
static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev) static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev)
{ return NULL; } { return NULL; }
static inline int iort_add_device_replay(const struct iommu_ops *ops, static inline int iort_add_device_replay(struct device *dev)
struct device *dev)
{ return 0; } { return 0; }
int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head) int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head)
{ return 0; } { return 0; }