[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <a311b6b9-a475-43b6-bb88-3e3d623ea2b3@wanadoo.fr>
Date: Fri, 3 Jan 2025 17:43:53 +0100
From: Christophe JAILLET <christophe.jaillet@...adoo.fr>
To: Gao Shiyuan <gaoshiyuan@...du.com>, joro@...tes.org,
suravee.suthikulpanit@....com, will@...nel.org, robin.murphy@....com
Cc: iommu@...ts.linux.dev, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/1] iommu/amd: remove return value of amd_iommu_detect
Le 03/01/2025 à 17:38, Gao Shiyuan a écrit :
> 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@...du.com>
> ---
> drivers/iommu/amd/init.c | 10 +++++-----
> include/linux/amd-iommu.h | 4 ++--
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
> index 0e0a531042ac..98a42f3f9e53 100644
> --- a/drivers/iommu/amd/init.c
> +++ b/drivers/iommu/amd/init.c
> @@ -3398,25 +3398,25 @@ 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;
> + return;
This return is not needed any more.
CJ
> }
>
> /****************************************************************************
> 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 */
>
Powered by blists - more mailing lists