Commit 5bb494d5 authored by Gao Shiyuan's avatar Gao Shiyuan Committed by Joerg Roedel
Browse files

iommu/amd: remove return value of amd_iommu_detect 



The return value of amd_iommu_detect is not used, so remove it and
is consistent with other iommu detect functions.

Signed-off-by: default avatarGao Shiyuan <gaoshiyuan@baidu.com>
Reviewed-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Link: https://lore.kernel.org/r/20250103165808.80939-1-gaoshiyuan@baidu.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent b0988acc

drivers/iommu/amd/init.c

+4 −6
Original line number Diff line number Diff line
@@ -3421,25 +3421,23 @@ static bool amd_iommu_sme_check(void) 
 * IOMMUs

 *

 ****************************************************************************/

int __init amd_iommu_detect(void)

void __init amd_iommu_detect(void)

{

	int ret;



	if (no_iommu || (iommu_detected && !gart_iommu_aperture))

		return -ENODEV;

		return;



	if (!amd_iommu_sme_check())

		return -ENODEV;

		return;



	ret = iommu_go_to_state(IOMMU_IVRS_DETECTED);

	if (ret)

		return ret;

		return;



	amd_iommu_detected = true;

	iommu_detected = 1;

	x86_init.iommu.iommu_init = amd_iommu_init;



	return 1;

}



/****************************************************************************

include/linux/amd-iommu.h

+2 −2
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ struct amd_iommu_pi_data { 
struct task_struct;

struct pci_dev;



extern int amd_iommu_detect(void);

extern void amd_iommu_detect(void);



#else /* CONFIG_AMD_IOMMU */



static inline int amd_iommu_detect(void) { return -ENODEV; }

static inline void amd_iommu_detect(void) { }



#endif /* CONFIG_AMD_IOMMU */