[PATCH] remove duplicate checking code

[PATCH] remove duplicate checking code

[Vaughan Cao]

amd_iommu_rlookup_table[devid] != NULL is already guaranteed by check_device
called before, it's fine to attach device at this point.

Signed-off-by: Vaughan Cao <vaughan.cao@oracle.com>
---
 drivers/iommu/amd_iommu.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index c949520..252851a 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3514,12 +3514,6 @@ int __init amd_iommu_init_passthrough(void)
 		dev_data = get_dev_data(&dev->dev);
 		dev_data->passthrough = true;
 
-		devid = get_device_id(&dev->dev);
-
-		iommu = amd_iommu_rlookup_table[devid];
-		if (!iommu)
-			continue;
-
 		attach_device(&dev->dev, pt_domain);
 	}
 
-- 
1.9.0

Re: [PATCH] remove duplicate checking code

[Joerg Roedel]

On Fri, May 16, 2014 at 03:39:40PM +0800, Vaughan Cao wrote:
> amd_iommu_rlookup_table[devid] != NULL is already guaranteed by check_device
> called before, it's fine to attach device at this point.
> 
> Signed-off-by: Vaughan Cao <vaughan.cao-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> ---
>  drivers/iommu/amd_iommu.c | 6 ------
>  1 file changed, 6 deletions(-)

Applied, thanks.

Re: [PATCH] remove duplicate checking code

[Paul Bolle]

On Mon, 2014-05-26 at 11:39 +0200, Joerg Roedel wrote:
> On Fri, May 16, 2014 at 03:39:40PM +0800, Vaughan Cao wrote:
> > amd_iommu_rlookup_table[devid] != NULL is already guaranteed by check_device
> > called before, it's fine to attach device at this point.
> > 
> > Signed-off-by: Vaughan Cao <vaughan.cao@oracle.com>
> > ---
> >  drivers/iommu/amd_iommu.c | 6 ------
> >  1 file changed, 6 deletions(-)
> 
> Applied, thanks.

This one entered linux-next, as of next-20142527, in commit ecef115d4540
("iommu/amd: Remove duplicate checking code"). It triggers an obviously
correct warning:
    drivers/iommu/amd_iommu.c: In function ‘amd_iommu_init_passthrough’:
    drivers/iommu/amd_iommu.c:3503:6: warning: unused variable ‘devid’ [-Wunused-variable]
      u16 devid;
          ^
    drivers/iommu/amd_iommu.c:3502:20: warning: unused variable ‘iommu’ [-Wunused-variable]
      struct amd_iommu *iommu;
                        ^

Is the trivial fix for this queued somewhere?


Paul Bolle

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Re: [PATCH] remove duplicate checking code

[Joerg Roedel]

On Thu, May 29, 2014 at 03:45:47PM +0200, Paul Bolle wrote:
> On Mon, 2014-05-26 at 11:39 +0200, Joerg Roedel wrote:
> > On Fri, May 16, 2014 at 03:39:40PM +0800, Vaughan Cao wrote:
> > > amd_iommu_rlookup_table[devid] != NULL is already guaranteed by check_device
> > > called before, it's fine to attach device at this point.
> > > 
> > > Signed-off-by: Vaughan Cao <vaughan.cao@oracle.com>
> > > ---
> > >  drivers/iommu/amd_iommu.c | 6 ------
> > >  1 file changed, 6 deletions(-)
> > 
> > Applied, thanks.
> 
> This one entered linux-next, as of next-20142527, in commit ecef115d4540
> ("iommu/amd: Remove duplicate checking code"). It triggers an obviously
> correct warning:
>     drivers/iommu/amd_iommu.c: In function ‘amd_iommu_init_passthrough’:
>     drivers/iommu/amd_iommu.c:3503:6: warning: unused variable ‘devid’ [-Wunused-variable]
>       u16 devid;
>           ^
>     drivers/iommu/amd_iommu.c:3502:20: warning: unused variable ‘iommu’ [-Wunused-variable]
>       struct amd_iommu *iommu;
>                         ^
> 
> Is the trivial fix for this queued somewhere?

Just queued one to my x86/amd branch. Thanks for the report.


	Joerg


_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu