Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 534766df authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu: Rename iommu_get_instance() 



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: default avatarJoerg Roedel <jroedel@suse.de>
parent 797a8b4d

drivers/acpi/arm64/iort.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/iommu/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/iommu.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

include/linux/of_iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -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;