iommu: Avoid unnecessary assignment of dev->iommu_fwspec

Zhen Lei · joergroedel · commit 909111ba0ba6 · 2017-02-06T14:06:42.000+01:00
Move the assignment statement into if branch above, where it only
needs to be.

Signed-off-by: Zhen Lei &lt;thunder.leizhen@huawei.com&gt;
Reviewed-by: Robin Murphy &lt;robin.murphy@arm.com&gt;
Signed-off-by: Joerg Roedel &lt;jroedel@suse.de&gt;
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
@@ -1869,13 +1869,14 @@ int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids)
 		fwspec = krealloc(dev->iommu_fwspec, size, GFP_KERNEL);
 		if (!fwspec)
 			return -ENOMEM;
+
+		dev->iommu_fwspec = fwspec;
 	}
 
 	for (i = 0; i < num_ids; i++)
 		fwspec->ids[fwspec->num_ids + i] = ids[i];
 
 	fwspec->num_ids += num_ids;
-	dev->iommu_fwspec = fwspec;
 	return 0;
 }
 EXPORT_SYMBOL_GPL(iommu_fwspec_add_ids);

Original file line number	Diff line number	Diff line change
`@@ -1869,13 +1869,14 @@ int iommu_fwspec_add_ids(struct device dev, u32 ids, int num_ids)`
`1869`	`1869`	`fwspec = krealloc(dev->iommu_fwspec, size, GFP_KERNEL);`
`1870`	`1870`	`if (!fwspec)`
`1871`	`1871`	`return -ENOMEM;`
	`1872`	`+`
	`1873`	`+ dev->iommu_fwspec = fwspec;`
`1872`	`1874`	`}`
`1873`	`1875`
`1874`	`1876`	`for (i = 0; i < num_ids; i++)`
`1875`	`1877`	`fwspec->ids[fwspec->num_ids + i] = ids[i];`
`1876`	`1878`
`1877`	`1879`	`fwspec->num_ids += num_ids;`
`1878`		`- dev->iommu_fwspec = fwspec;`
`1879`	`1880`	`return 0;`
`1880`	`1881`	`}`
`1881`	`1882`	`EXPORT_SYMBOL_GPL(iommu_fwspec_add_ids);`