| Message ID | 20200817105946.1511-1-yuzenghui@huawei.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | ACPI/IORT: Drop the unused @ops of iort_add_device_replay() | expand |
On 2020/8/17 18:59, Zenghui Yu wrote: > Since commit d2e1a003af56 ("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> > --- > drivers/acpi/arm64/iort.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index ec782e4a0fe4..a0ece0e201b2 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -811,8 +811,7 @@ static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev) > return (fwspec && fwspec->ops) ? fwspec->ops : NULL; > } > > -static inline int iort_add_device_replay(const struct iommu_ops *ops, > - struct device *dev) > +static inline int iort_add_device_replay(struct device *dev) > { > int err = 0; > > @@ -1072,7 +1071,7 @@ const struct iommu_ops *iort_iommu_configure_id(struct device *dev, > */ > if (!err) { > 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 */ > @@ -1089,8 +1088,7 @@ const struct iommu_ops *iort_iommu_configure_id(struct device *dev, > #else > static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev) > { return NULL; } > -static inline int iort_add_device_replay(const struct iommu_ops *ops, > - struct device *dev) > +static inline int iort_add_device_replay(struct device *dev) inline functions iort_fwspec_iommu_ops() and iort_add_device_replay() are not needed anymore after commit 8212688600ed ("ACPI/IORT: Fix build error when IOMMU_SUPPORT is disabled"), could you please add another patch to remove them as well? Thanks Hanjun
On 2020/8/18 11:49, Hanjun Guo wrote: > On 2020/8/17 18:59, Zenghui Yu wrote: >> Since commit d2e1a003af56 ("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> >> --- >> drivers/acpi/arm64/iort.c | 8 +++----- >> 1 file changed, 3 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c >> index ec782e4a0fe4..a0ece0e201b2 100644 >> --- a/drivers/acpi/arm64/iort.c >> +++ b/drivers/acpi/arm64/iort.c >> @@ -811,8 +811,7 @@ static inline const struct iommu_ops >> *iort_fwspec_iommu_ops(struct device *dev) >> return (fwspec && fwspec->ops) ? fwspec->ops : NULL; >> } >> -static inline int iort_add_device_replay(const struct iommu_ops *ops, >> - struct device *dev) >> +static inline int iort_add_device_replay(struct device *dev) >> { >> int err = 0; >> @@ -1072,7 +1071,7 @@ const struct iommu_ops >> *iort_iommu_configure_id(struct device *dev, >> */ >> if (!err) { >> 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 */ >> @@ -1089,8 +1088,7 @@ const struct iommu_ops >> *iort_iommu_configure_id(struct device *dev, >> #else >> static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct >> device *dev) >> { return NULL; } >> -static inline int iort_add_device_replay(const struct iommu_ops *ops, >> - struct device *dev) >> +static inline int iort_add_device_replay(struct device *dev) > > inline functions iort_fwspec_iommu_ops() and iort_add_device_replay() > are not needed anymore after commit 8212688600ed ("ACPI/IORT: Fix build > error when IOMMU_SUPPORT is disabled"), could you please add another > patch to remove them as well? Sure, I will remove them in v2. Thanks for the reminder. Zenghui
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index ec782e4a0fe4..a0ece0e201b2 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -811,8 +811,7 @@ static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev) return (fwspec && fwspec->ops) ? fwspec->ops : NULL; } -static inline int iort_add_device_replay(const struct iommu_ops *ops, - struct device *dev) +static inline int iort_add_device_replay(struct device *dev) { int err = 0; @@ -1072,7 +1071,7 @@ const struct iommu_ops *iort_iommu_configure_id(struct device *dev, */ if (!err) { 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 */ @@ -1089,8 +1088,7 @@ const struct iommu_ops *iort_iommu_configure_id(struct device *dev, #else static inline const struct iommu_ops *iort_fwspec_iommu_ops(struct device *dev) { return NULL; } -static inline int iort_add_device_replay(const struct iommu_ops *ops, - struct device *dev) +static inline int iort_add_device_replay(struct device *dev) { return 0; } int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head) { return 0; }
Since commit d2e1a003af56 ("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> --- drivers/acpi/arm64/iort.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)