iommu/amd: Remove duplicate check of devid
authorShaokun Zhang <zhangshaokun@hisilicon.com>
Fri, 9 Apr 2021 03:30:40 +0000 (11:30 +0800)
committerJoerg Roedel <jroedel@suse.de>
Thu, 15 Apr 2021 13:40:10 +0000 (15:40 +0200)
'devid' has been checked in function check_device, no need to double
check and clean up this.

Cc: Joerg Roedel <joro@8bytes.org>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
Link: https://lore.kernel.org/r/1617939040-35579-1-git-send-email-zhangshaokun@hisilicon.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/amd/iommu.c

index f164f31909f86f9f9f4eac08f4b2db647825ba43..4ed9bc72cf98c30378edb765216af789a4900d0d 100644 (file)
@@ -1685,9 +1685,6 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev)
                return ERR_PTR(-ENODEV);
 
        devid = get_device_id(dev);
-       if (devid < 0)
-               return ERR_PTR(devid);
-
        iommu = amd_iommu_rlookup_table[devid];
 
        if (dev_iommu_priv_get(dev))
@@ -1989,16 +1986,12 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,
                                    struct device *dev)
 {
        struct iommu_dev_data *dev_data = dev_iommu_priv_get(dev);
+       int devid = get_device_id(dev);
        struct amd_iommu *iommu;
-       int devid;
 
        if (!check_device(dev))
                return;
 
-       devid = get_device_id(dev);
-       if (devid < 0)
-               return;
-
        if (dev_data->domain != NULL)
                detach_device(dev);