iommu: Move more initialization to __iommu_probe_device() (4e8906f0) · Commits · 戴 / test

drivers/iommu/iommu.c

+18 −29

Original line number	Diff line number	Diff line
		@@ -194,9 +194,19 @@ static int __iommu_probe_device(struct device dev, struct list_head group_list
		struct iommu_group *group;
		int ret;

		if (!dev_iommu_get(dev))
		return -ENOMEM;

		if (!try_module_get(ops->owner)) {
		ret = -EINVAL;
		goto err_free;
		}

		iommu_dev = ops->probe_device(dev);
		if (IS_ERR(iommu_dev))
		return PTR_ERR(iommu_dev);
		if (IS_ERR(iommu_dev)) {
		ret = PTR_ERR(iommu_dev);
		goto out_module_put;
		}

		dev->iommu->iommu_dev = iommu_dev;

		@@ -217,6 +227,12 @@ static int __iommu_probe_device(struct device dev, struct list_head group_list
		out_release:
		ops->release_device(dev);

		out_module_put:
		module_put(ops->owner);

		err_free:
		dev_iommu_free(dev);

		return ret;
		}

		@@ -226,14 +242,6 @@ int iommu_probe_device(struct device *dev)
		struct iommu_group *group;
		int ret;

		if (!dev_iommu_get(dev))
		return -ENOMEM;

		if (!try_module_get(ops->owner)) {
		ret = -EINVAL;
		goto err_out;
		}

		ret = __iommu_probe_device(dev, NULL);
		if (ret)
		goto err_out;
		@@ -1532,14 +1540,10 @@ struct iommu_domain iommu_group_default_domain(struct iommu_group group)

		static int probe_iommu_group(struct device dev, void data)
		{
		const struct iommu_ops *ops = dev->bus->iommu_ops;
		struct list_head *group_list = data;
		struct iommu_group *group;
		int ret;

		if (!dev_iommu_get(dev))
		return -ENOMEM;

		/* Device is probed already if in a group */
		group = iommu_group_get(dev);
		if (group) {
		@@ -1547,22 +1551,7 @@ static int probe_iommu_group(struct device dev, void data)
		return 0;
		}

		if (!try_module_get(ops->owner)) {
		ret = -EINVAL;
		goto err_free_dev_iommu;
		}

		ret = __iommu_probe_device(dev, group_list);
		if (ret)
		goto err_module_put;

		return 0;

		err_module_put:
		module_put(ops->owner);
		err_free_dev_iommu:
		dev_iommu_free(dev);

		if (ret == -ENODEV)
		ret = 0;

Admin message