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

Commit 5da14a47 authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by Joerg Roedel
Browse files

omap: iommu: PREFETCH_IOTLB cleanup 



Use PREFETCH_IOTLB to control the content of the called function,
instead of inlining it in the code.

This improves readability of the code, and also prevents an "unused
function" warning to show up when PREFETCH_IOTLB isn't set.

Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Acked-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent e1f23813

drivers/iommu/omap-iommu.c

+16 −3
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ static struct cr_regs __iotlb_read_cr(struct iommu *obj, int n) 
 * @obj:	target iommu

 * @e:		an iommu tlb entry info

 **/

#ifdef PREFETCH_IOTLB

static int load_iotlb_entry(struct iommu *obj, struct iotlb_entry *e)

{

	int err = 0;
@@ -310,6 +311,20 @@ static int load_iotlb_entry(struct iommu *obj, struct iotlb_entry *e) 
	return err;

}



#else /* !PREFETCH_IOTLB */



static int load_iotlb_entry(struct iommu *obj, struct iotlb_entry *e)

{

	return 0;

}



#endif /* !PREFETCH_IOTLB */



static int prefetch_iotlb_entry(struct iommu *obj, struct iotlb_entry *e)

{

	return load_iotlb_entry(obj, e);

}



/**

 * flush_iotlb_page - Clear an iommu tlb entry

 * @obj:	target iommu
@@ -663,10 +678,8 @@ int iopgtable_store_entry(struct iommu *obj, struct iotlb_entry *e) 


	flush_iotlb_page(obj, e->da);

	err = iopgtable_store_entry_core(obj, e);

#ifdef PREFETCH_IOTLB

	if (!err)

		load_iotlb_entry(obj, e);

#endif

		prefetch_iotlb_entry(obj, e);

	return err;

}

EXPORT_SYMBOL_GPL(iopgtable_store_entry);