Commit eb03f2d2 authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Joerg Roedel
Browse files

iommu/amd: Remove iommu_init_ga() 



Since the function has been simplified and only call iommu_init_ga_log(),
remove the function and replace with iommu_init_ga_log() instead.

Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Link: https://lore.kernel.org/r/20210820202957.187572-4-suravee.suthikulpanit@amd.com


Fixes: 8bda0cfb ("iommu/amd: Detect and initialize guest vAPIC log")
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent c3811a50

drivers/iommu/amd/init.c

+4 −13
Original line number Diff line number Diff line
@@ -829,9 +829,9 @@ static int iommu_ga_log_enable(struct amd_iommu *iommu) 
	return 0;

}



#ifdef CONFIG_IRQ_REMAP

static int iommu_init_ga_log(struct amd_iommu *iommu)

{

#ifdef CONFIG_IRQ_REMAP

	u64 entry;



	if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))
@@ -861,18 +861,9 @@ static int iommu_init_ga_log(struct amd_iommu *iommu) 
err_out:

	free_ga_log(iommu);

	return -EINVAL;

}

#endif /* CONFIG_IRQ_REMAP */



static int iommu_init_ga(struct amd_iommu *iommu)

{

	int ret = 0;



#ifdef CONFIG_IRQ_REMAP

	ret = iommu_init_ga_log(iommu);

#else

	return 0;

#endif /* CONFIG_IRQ_REMAP */



	return ret;

}



static int __init alloc_cwwb_sem(struct amd_iommu *iommu)
@@ -1854,7 +1845,7 @@ static int __init iommu_init_pci(struct amd_iommu *iommu) 
	if (iommu_feature(iommu, FEATURE_PPR) && alloc_ppr_log(iommu))

		return -ENOMEM;



	ret = iommu_init_ga(iommu);

	ret = iommu_init_ga_log(iommu);

	if (ret)

		return ret;