iommu: remove useless parameter in iommu_bus_init().

[PATCH] iommu: remove useless parameter in iommu_bus_init().

Posted by Yu Zhang 3 years, 6 months ago

Parameter 'ops' is no longer used by iommu_bus_init(), after
commit 8cec63e52966 ("iommu: Remove iommu_callback_data").

So just remove it.

Signed-off-by: Yu Zhang <yu.c.zhang@linux.intel.com>
---
 drivers/iommu/iommu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 3a808146b50f..bedda1e0f016 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1775,7 +1775,7 @@ int bus_iommu_probe(struct bus_type *bus)
 	return ret;
 }
 
-static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
+static int iommu_bus_init(struct bus_type *bus)
 {
 	struct notifier_block *nb;
 	int err;
@@ -1836,7 +1836,7 @@ int bus_set_iommu(struct bus_type *bus, const struct iommu_ops *ops)
 	bus->iommu_ops = ops;
 
 	/* Do IOMMU specific setup for this bus-type */
-	err = iommu_bus_init(bus, ops);
+	err = iommu_bus_init(bus);
 	if (err)
 		bus->iommu_ops = NULL;
 
-- 
2.25.1

Re: [PATCH] iommu: remove useless parameter in iommu_bus_init().

Posted by Baolu Lu 3 years, 6 months ago

On 2022/9/30 15:02, Yu Zhang wrote:
> Parameter 'ops' is no longer used by iommu_bus_init(), after
> commit 8cec63e52966 ("iommu: Remove iommu_callback_data").
> 
> So just remove it.
> 
> Signed-off-by: Yu Zhang <yu.c.zhang@linux.intel.com>
> ---
>   drivers/iommu/iommu.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index 3a808146b50f..bedda1e0f016 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -1775,7 +1775,7 @@ int bus_iommu_probe(struct bus_type *bus)
>   	return ret;
>   }
>   
> -static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
> +static int iommu_bus_init(struct bus_type *bus)
>   {
>   	struct notifier_block *nb;
>   	int err;
> @@ -1836,7 +1836,7 @@ int bus_set_iommu(struct bus_type *bus, const struct iommu_ops *ops)
>   	bus->iommu_ops = ops;
>   
>   	/* Do IOMMU specific setup for this bus-type */
> -	err = iommu_bus_init(bus, ops);
> +	err = iommu_bus_init(bus);
>   	if (err)
>   		bus->iommu_ops = NULL;
>   

bus_set_iommu() has been retired. All patches are just queued in
linux-next and will show up in v6.1-rc1.

Best regards,
baolu

Re: [PATCH] iommu: remove useless parameter in iommu_bus_init().

Posted by Yu Zhang 3 years, 6 months ago

On Fri, Sep 30, 2022 at 04:04:41PM +0800, Baolu Lu wrote:
> On 2022/9/30 15:02, Yu Zhang wrote:
> > Parameter 'ops' is no longer used by iommu_bus_init(), after
> > commit 8cec63e52966 ("iommu: Remove iommu_callback_data").
> > 
> > So just remove it.
> > 
> > Signed-off-by: Yu Zhang <yu.c.zhang@linux.intel.com>
> > ---
> >   drivers/iommu/iommu.c | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> > index 3a808146b50f..bedda1e0f016 100644
> > --- a/drivers/iommu/iommu.c
> > +++ b/drivers/iommu/iommu.c
> > @@ -1775,7 +1775,7 @@ int bus_iommu_probe(struct bus_type *bus)
> >   	return ret;
> >   }
> > -static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
> > +static int iommu_bus_init(struct bus_type *bus)
> >   {
> >   	struct notifier_block *nb;
> >   	int err;
> > @@ -1836,7 +1836,7 @@ int bus_set_iommu(struct bus_type *bus, const struct iommu_ops *ops)
> >   	bus->iommu_ops = ops;
> >   	/* Do IOMMU specific setup for this bus-type */
> > -	err = iommu_bus_init(bus, ops);
> > +	err = iommu_bus_init(bus);
> >   	if (err)
> >   		bus->iommu_ops = NULL;
> 
> bus_set_iommu() has been retired. All patches are just queued in
> linux-next and will show up in v6.1-rc1.

Oh. Sorry for the disturbance.

B.R.
Yu
> 
> Best regards,
> baolu