mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-22 23:13:01 +02:00
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: Gao Shiyuan <gaoshiyuan@baidu.com> Reviewed-by: Vasant Hegde <vasant.hegde@amd.com> Link: https://lore.kernel.org/r/20250103165808.80939-1-gaoshiyuan@baidu.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
b0988acc94
commit
5bb494d5cb
|
@ -3421,25 +3421,23 @@ static bool amd_iommu_sme_check(void)
|
||||||
* IOMMUs
|
* IOMMUs
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
int __init amd_iommu_detect(void)
|
void __init amd_iommu_detect(void)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (no_iommu || (iommu_detected && !gart_iommu_aperture))
|
if (no_iommu || (iommu_detected && !gart_iommu_aperture))
|
||||||
return -ENODEV;
|
return;
|
||||||
|
|
||||||
if (!amd_iommu_sme_check())
|
if (!amd_iommu_sme_check())
|
||||||
return -ENODEV;
|
return;
|
||||||
|
|
||||||
ret = iommu_go_to_state(IOMMU_IVRS_DETECTED);
|
ret = iommu_go_to_state(IOMMU_IVRS_DETECTED);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return;
|
||||||
|
|
||||||
amd_iommu_detected = true;
|
amd_iommu_detected = true;
|
||||||
iommu_detected = 1;
|
iommu_detected = 1;
|
||||||
x86_init.iommu.iommu_init = amd_iommu_init;
|
x86_init.iommu.iommu_init = amd_iommu_init;
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
|
|
@ -31,11 +31,11 @@ struct amd_iommu_pi_data {
|
||||||
struct task_struct;
|
struct task_struct;
|
||||||
struct pci_dev;
|
struct pci_dev;
|
||||||
|
|
||||||
extern int amd_iommu_detect(void);
|
extern void amd_iommu_detect(void);
|
||||||
|
|
||||||
#else /* CONFIG_AMD_IOMMU */
|
#else /* CONFIG_AMD_IOMMU */
|
||||||
|
|
||||||
static inline int amd_iommu_detect(void) { return -ENODEV; }
|
static inline void amd_iommu_detect(void) { }
|
||||||
|
|
||||||
#endif /* CONFIG_AMD_IOMMU */
|
#endif /* CONFIG_AMD_IOMMU */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user