mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
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: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
parent
e1f2381332
commit
5da14a4714
1 changed files with 16 additions and 3 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue