[PATCH v2 0/2] ACPI/IORT: Code cleanups

[PATCH v2 0/2] ACPI/IORT: Code cleanups

[Zenghui Yu]

* From v1 [1]:
  - As pointed out by Hanjun, remove two now unused inline functions.
    Compile tested with CONFIG_IOMMU_API is not selected.

[1] https://lore.kernel.org/r/20200817105946.1511-1-yuzenghui@huawei.com

Zenghui Yu (2):
  ACPI/IORT: Drop the unused @ops of iort_add_device_replay()
  ACPI/IORT: Remove the unused inline functions

 drivers/acpi/arm64/iort.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

-- 
2.19.1

[PATCH v2 1/2] ACPI/IORT: Drop the unused @ops of iort_add_device_replay()

[Zenghui Yu]

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)
 { return 0; }
 int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head)
 { return 0; }
-- 
2.19.1

[PATCH v2 2/2] ACPI/IORT: Remove the unused inline functions

[Zenghui Yu]

Since commit 8212688600ed ("ACPI/IORT: Fix build error when IOMMU_SUPPORT
is disabled"), iort_fwspec_iommu_ops() and iort_add_device_replay() are not
needed anymore when CONFIG_IOMMU_API is not selected. Let's remove them.

Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
---
 drivers/acpi/arm64/iort.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index a0ece0e201b2..e670785a6201 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -1086,10 +1086,6 @@ 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(struct device *dev)
-{ return 0; }
 int iort_iommu_msi_get_resv_regions(struct device *dev, struct list_head *head)
 { return 0; }
 const struct iommu_ops *iort_iommu_configure_id(struct device *dev,
-- 
2.19.1

Re: [PATCH v2 0/2] ACPI/IORT: Code cleanups

[Hanjun Guo]

On 2020/8/18 14:36, Zenghui Yu wrote:
> * From v1 [1]:
>    - As pointed out by Hanjun, remove two now unused inline functions.
>      Compile tested with CONFIG_IOMMU_API is not selected.
> 
> [1] https://lore.kernel.org/r/20200817105946.1511-1-yuzenghui@huawei.com
> 
> Zenghui Yu (2):
>    ACPI/IORT: Drop the unused @ops of iort_add_device_replay()
>    ACPI/IORT: Remove the unused inline functions
> 
>   drivers/acpi/arm64/iort.c | 10 ++--------
>   1 file changed, 2 insertions(+), 8 deletions(-)

Nice cleanup.

Acked-by: Hanjun Guo <guohanjun@huawei.com>

Re: [PATCH v2 0/2] ACPI/IORT: Code cleanups

[Hanjun Guo]

+Cc Will

On 2020/8/18 17:16, Hanjun Guo wrote:
> On 2020/8/18 14:36, Zenghui Yu wrote:
>> * From v1 [1]:
>>    - As pointed out by Hanjun, remove two now unused inline functions.
>>      Compile tested with CONFIG_IOMMU_API is not selected.
>>
>> [1] https://lore.kernel.org/r/20200817105946.1511-1-yuzenghui@huawei.com
>>
>> Zenghui Yu (2):
>>    ACPI/IORT: Drop the unused @ops of iort_add_device_replay()
>>    ACPI/IORT: Remove the unused inline functions
>>
>>   drivers/acpi/arm64/iort.c | 10 ++--------
>>   1 file changed, 2 insertions(+), 8 deletions(-)
> 
> Nice cleanup.
> 
> Acked-by: Hanjun Guo <guohanjun@huawei.com>

Will, would you mind taking this patch set via ARM64 tree?

Thanks
Hanjun

Re: [PATCH v2 0/2] ACPI/IORT: Code cleanups

[Will Deacon]

On Wed, Sep 02, 2020 at 05:17:43PM +0800, Hanjun Guo wrote:
> +Cc Will
> 
> On 2020/8/18 17:16, Hanjun Guo wrote:
> > On 2020/8/18 14:36, Zenghui Yu wrote:
> > > * From v1 [1]:
> > >    - As pointed out by Hanjun, remove two now unused inline functions.
> > >      Compile tested with CONFIG_IOMMU_API is not selected.
> > > 
> > > [1] https://lore.kernel.org/r/20200817105946.1511-1-yuzenghui@huawei.com
> > > 
> > > Zenghui Yu (2):
> > >    ACPI/IORT: Drop the unused @ops of iort_add_device_replay()
> > >    ACPI/IORT: Remove the unused inline functions
> > > 
> > >   drivers/acpi/arm64/iort.c | 10 ++--------
> > >   1 file changed, 2 insertions(+), 8 deletions(-)
> > 
> > Nice cleanup.
> > 
> > Acked-by: Hanjun Guo <guohanjun@huawei.com>
> 
> Will, would you mind taking this patch set via ARM64 tree?

Sure, no problem. I'll queue this for 5.10 later this week.

Will

Re: [PATCH v2 0/2] ACPI/IORT: Code cleanups

[Hanjun Guo]

On 2020/9/2 17:48, Will Deacon wrote:
> On Wed, Sep 02, 2020 at 05:17:43PM +0800, Hanjun Guo wrote:
>> +Cc Will
>>
>> On 2020/8/18 17:16, Hanjun Guo wrote:
>>> On 2020/8/18 14:36, Zenghui Yu wrote:
>>>> * From v1 [1]:
>>>>     - As pointed out by Hanjun, remove two now unused inline functions.
>>>>       Compile tested with CONFIG_IOMMU_API is not selected.
>>>>
>>>> [1] https://lore.kernel.org/r/20200817105946.1511-1-yuzenghui@huawei.com
>>>>
>>>> Zenghui Yu (2):
>>>>     ACPI/IORT: Drop the unused @ops of iort_add_device_replay()
>>>>     ACPI/IORT: Remove the unused inline functions
>>>>
>>>>    drivers/acpi/arm64/iort.c | 10 ++--------
>>>>    1 file changed, 2 insertions(+), 8 deletions(-)
>>>
>>> Nice cleanup.
>>>
>>> Acked-by: Hanjun Guo <guohanjun@huawei.com>
>>
>> Will, would you mind taking this patch set via ARM64 tree?
> 
> Sure, no problem. I'll queue this for 5.10 later this week.

Thanks!

Hanjun

Re: [PATCH v2 0/2] ACPI/IORT: Code cleanups

[Lorenzo Pieralisi]

On Tue, Aug 18, 2020 at 02:36:23PM +0800, Zenghui Yu wrote:
> * From v1 [1]:
>   - As pointed out by Hanjun, remove two now unused inline functions.
>     Compile tested with CONFIG_IOMMU_API is not selected.
> 
> [1] https://lore.kernel.org/r/20200817105946.1511-1-yuzenghui@huawei.com
> 
> Zenghui Yu (2):
>   ACPI/IORT: Drop the unused @ops of iort_add_device_replay()
>   ACPI/IORT: Remove the unused inline functions
> 
>  drivers/acpi/arm64/iort.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)

On the series:

Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

Re: [PATCH v2 0/2] ACPI/IORT: Code cleanups

[Will Deacon]

On Tue, 18 Aug 2020 14:36:23 +0800, Zenghui Yu wrote:
> * From v1 [1]:
>   - As pointed out by Hanjun, remove two now unused inline functions.
>     Compile tested with CONFIG_IOMMU_API is not selected.
> 
> [1] https://lore.kernel.org/r/20200817105946.1511-1-yuzenghui@huawei.com
> 
> Zenghui Yu (2):
>   ACPI/IORT: Drop the unused @ops of iort_add_device_replay()
>   ACPI/IORT: Remove the unused inline functions
> 
> [...]

Applied to arm64 (for-next/acpi), thanks!

[1/2] ACPI/IORT: Drop the unused @ops of iort_add_device_replay()
      https://git.kernel.org/arm64/c/1ab64cf81489
[2/2] ACPI/IORT: Remove the unused inline functions
      https://git.kernel.org/arm64/c/c2bea7a1a1c0

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev