iommu: Rename iommu_get_instance()

joergroedel · joergroedel · commit 534766dfef99 · 2017-02-10T13:44:57.000+01:00
Rename the function to iommu_ops_from_fwnode(), because that
is what the function actually does. The new name is much
more descriptive about what the function does.

Signed-off-by: Joerg Roedel &lt;jroedel@suse.de&gt;
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
@@ -536,7 +536,7 @@ static const struct iommu_ops *iort_iommu_xlate(struct device *dev,
 		if (!iort_fwnode)
 			return NULL;
 
-		ops = iommu_get_instance(iort_fwnode);
+		ops = iommu_ops_from_fwnode(iort_fwnode);
 		if (!ops)
 			return NULL;
 
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
@@ -1664,7 +1664,7 @@ void iommu_register_instance(struct fwnode_handle *fwnode,
 	spin_unlock(&iommu_instance_lock);
 }
 
-const struct iommu_ops *iommu_get_instance(struct fwnode_handle *fwnode)
+const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle *fwnode)
 {
 	struct iommu_instance *instance;
 	const struct iommu_ops *ops = NULL;
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
@@ -354,7 +354,7 @@ void iommu_fwspec_free(struct device *dev);
 int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids);
 void iommu_register_instance(struct fwnode_handle *fwnode,
 			     const struct iommu_ops *ops);
-const struct iommu_ops *iommu_get_instance(struct fwnode_handle *fwnode);
+const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle *fwnode);
 
 #else /* CONFIG_IOMMU_API */
 
@@ -590,7 +590,7 @@ static inline void iommu_register_instance(struct fwnode_handle *fwnode,
 }
 
 static inline
-const struct iommu_ops *iommu_get_instance(struct fwnode_handle *fwnode)
+const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle *fwnode)
 {
 	return NULL;
 }
diff --git a/include/linux/of_iommu.h b/include/linux/of_iommu.h
@@ -39,7 +39,7 @@ static inline void of_iommu_set_ops(struct device_node *np,
 
 static inline const struct iommu_ops *of_iommu_get_ops(struct device_node *np)
 {
-	return iommu_get_instance(&np->fwnode);
+	return iommu_ops_from_fwnode(&np->fwnode);
 }
 
 extern struct of_device_id __iommu_of_table;

Original file line number	Diff line number	Diff line change
`@@ -1664,7 +1664,7 @@ void iommu_register_instance(struct fwnode_handle *fwnode,`
`1664`	`1664`	`spin_unlock(&iommu_instance_lock);`
`1665`	`1665`	`}`
`1666`	`1666`
`1667`		`-const struct iommu_ops iommu_get_instance(struct fwnode_handle fwnode)`
	`1667`	`+const struct iommu_ops iommu_ops_from_fwnode(struct fwnode_handle fwnode)`
`1668`	`1668`	`{`
`1669`	`1669`	`struct iommu_instance *instance;`
`1670`	`1670`	`const struct iommu_ops *ops = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ void iommu_fwspec_free(struct device *dev);`
`354`	`354`	`int iommu_fwspec_add_ids(struct device dev, u32 ids, int num_ids);`
`355`	`355`	`void iommu_register_instance(struct fwnode_handle *fwnode,`
`356`	`356`	`const struct iommu_ops *ops);`
`357`		`-const struct iommu_ops iommu_get_instance(struct fwnode_handle fwnode);`
	`357`	`+const struct iommu_ops iommu_ops_from_fwnode(struct fwnode_handle fwnode);`
`358`	`358`
`359`	`359`	`#else /* CONFIG_IOMMU_API */`
`360`	`360`
`@@ -590,7 +590,7 @@ static inline void iommu_register_instance(struct fwnode_handle *fwnode,`
`590`	`590`	`}`
`591`	`591`
`592`	`592`	`static inline`
`593`		`-const struct iommu_ops iommu_get_instance(struct fwnode_handle fwnode)`
	`593`	`+const struct iommu_ops iommu_ops_from_fwnode(struct fwnode_handle fwnode)`
`594`	`594`	`{`
`595`	`595`	`return NULL;`
`596`	`596`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ static inline void of_iommu_set_ops(struct device_node *np,`
`39`	`39`
`40`	`40`	`static inline const struct iommu_ops of_iommu_get_ops(struct device_node np)`
`41`	`41`	`{`
`42`		`- return iommu_get_instance(&np->fwnode);`
	`42`	`+ return iommu_ops_from_fwnode(&np->fwnode);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`extern struct of_device_id __iommu_of_table;`