On 6/5/2025 2:14 PM, Anup Patel wrote:
> The kvm_riscv_vcpu_aia_init() does not return any failure so drop
> the return value which is always zero.
>
> Signed-off-by: Anup Patel <apatel@xxxxxxxxxxxxxxxx>
> ---
> arch/riscv/include/asm/kvm_aia.h | 2 +-
> arch/riscv/kvm/aia_device.c | 6 ++----
> arch/riscv/kvm/vcpu.c | 4 +---
> 3 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/arch/riscv/include/asm/kvm_aia.h b/arch/riscv/include/asm/kvm_aia.h
> index 3b643b9efc07..0a0f12496f00 100644
> --- a/arch/riscv/include/asm/kvm_aia.h
> +++ b/arch/riscv/include/asm/kvm_aia.h
> @@ -147,7 +147,7 @@ int kvm_riscv_vcpu_aia_rmw_ireg(struct kvm_vcpu *vcpu, unsigned int csr_num,
>
> int kvm_riscv_vcpu_aia_update(struct kvm_vcpu *vcpu);
> void kvm_riscv_vcpu_aia_reset(struct kvm_vcpu *vcpu);
> -int kvm_riscv_vcpu_aia_init(struct kvm_vcpu *vcpu);
> +void kvm_riscv_vcpu_aia_init(struct kvm_vcpu *vcpu);
> void kvm_riscv_vcpu_aia_deinit(struct kvm_vcpu *vcpu);
>
> int kvm_riscv_aia_inject_msi_by_id(struct kvm *kvm, u32 hart_index,
> diff --git a/arch/riscv/kvm/aia_device.c b/arch/riscv/kvm/aia_device.c
> index 43e472ff3e1a..5b7ed2d987db 100644
> --- a/arch/riscv/kvm/aia_device.c
> +++ b/arch/riscv/kvm/aia_device.c
> @@ -539,12 +539,12 @@ void kvm_riscv_vcpu_aia_reset(struct kvm_vcpu *vcpu)
> kvm_riscv_vcpu_aia_imsic_reset(vcpu);
> }
>
> -int kvm_riscv_vcpu_aia_init(struct kvm_vcpu *vcpu)
> +void kvm_riscv_vcpu_aia_init(struct kvm_vcpu *vcpu)
> {
> struct kvm_vcpu_aia *vaia = &vcpu->arch.aia_context;
>
> if (!kvm_riscv_aia_available())
> - return 0;
> + return;
>
> /*
> * We don't do any memory allocations over here because these
> @@ -556,8 +556,6 @@ int kvm_riscv_vcpu_aia_init(struct kvm_vcpu *vcpu)
> /* Initialize default values in AIA vcpu context */
> vaia->imsic_addr = KVM_RISCV_AIA_UNDEF_ADDR;
> vaia->hart_index = vcpu->vcpu_idx;
> -
> - return 0;
> }
>
> void kvm_riscv_vcpu_aia_deinit(struct kvm_vcpu *vcpu)
> diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c
> index 6a1914b21ec3..f98a1894d55b 100644
> --- a/arch/riscv/kvm/vcpu.c
> +++ b/arch/riscv/kvm/vcpu.c
> @@ -160,9 +160,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
> kvm_riscv_vcpu_pmu_init(vcpu);
>
> /* Setup VCPU AIA */
> - rc = kvm_riscv_vcpu_aia_init(vcpu);
> - if (rc)
> - return rc;
> + kvm_riscv_vcpu_aia_init(vcpu);
>
Reviewed-by: Nutty Liu<liujingqi@xxxxxxxxxxxxxxxxxxx>
This seems more reasonable.
Thanks,
Nutty
> /*
> * Setup SBI extensions
