[PATCH v2 1/1] iommu/amd: remove return value of amd_iommu_detect

[PATCH v2 1/1] iommu/amd: remove return value of amd_iommu_detect

[Gao Shiyuan]

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>
---
 drivers/iommu/amd/init.c  | 10 ++++------
 include/linux/amd-iommu.h |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

v1 -> v2:
* Remove return; at the end of amd_iommu_detect

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 0e0a531042ac..bc419d3b7c1e 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -3398,25 +3398,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;
 }
 
 /****************************************************************************
diff --git a/include/linux/amd-iommu.h b/include/linux/amd-iommu.h
index 2b90c48a6a87..062fbd4c9b77 100644
--- a/include/linux/amd-iommu.h
+++ b/include/linux/amd-iommu.h
@@ -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 */
 
-- 
2.39.3 (Apple Git-146)

Re: [PATCH v2 1/1] iommu/amd: remove return value of amd_iommu_detect

[Vasant Hegde]

On 1/3/2025 10:28 PM, Gao Shiyuan wrote:
> 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>

Thanks for the fix.

Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>

-Vasant

Re: [PATCH v2 1/1] iommu/amd: remove return value of amd_iommu_detect

[Joerg Roedel]

On Sat, Jan 04, 2025 at 12:58:08AM +0800, Gao Shiyuan wrote:
> 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>
> ---
>  drivers/iommu/amd/init.c  | 10 ++++------
>  include/linux/amd-iommu.h |  4 ++--
>  2 files changed, 6 insertions(+), 8 deletions(-)

Applied, thanks.