2023-06-14 03:01:10

by baomingtong001

Subject: [PATCH] KVM: PPC: remove unneeded variable

fix the following coccicheck warning:

arch/powerpc/kvm/book3s_pr.c:424:5-6: Unneeded variable: "r".

Signed-off-by: Mingtong Bao <[email protected]>
---
arch/powerpc/kvm/book3s_pr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 9118242063fb..d03b31b240d7 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -421,14 +421,14 @@ void kvmppc_restore_tm_pr(struct kvm_vcpu *vcpu)

static int kvmppc_core_check_requests_pr(struct kvm_vcpu *vcpu)
{
- int r = 1; /* Indicate we want to get back into the guest */
+ /* Indicate we want to get back into the guest */

/* We misuse TLB_FLUSH to indicate that we want to clear
all shadow cache entries */
if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu))
kvmppc_mmu_pte_flush(vcpu, 0, 0);

- return r;
+ return 1;
}

/************* MMU Notifiers *************/

2023-06-14 04:36:59

by Paul Mackerras

Subject: Re: [PATCH] KVM: PPC: remove unneeded variable

On Wed, Jun 14, 2023 at 10:34:45AM +0800, [email protected] wrote:
> fix the following coccicheck warning:
>
> arch/powerpc/kvm/book3s_pr.c:424:5-6: Unneeded variable: "r".
>
> Signed-off-by: Mingtong Bao <[email protected]>
> ---
> arch/powerpc/kvm/book3s_pr.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
> index 9118242063fb..d03b31b240d7 100644
> --- a/arch/powerpc/kvm/book3s_pr.c
> +++ b/arch/powerpc/kvm/book3s_pr.c
> @@ -421,14 +421,14 @@ void kvmppc_restore_tm_pr(struct kvm_vcpu *vcpu)
>
> static int kvmppc_core_check_requests_pr(struct kvm_vcpu *vcpu)
> {
> - int r = 1; /* Indicate we want to get back into the guest */
> + /* Indicate we want to get back into the guest */

Instead of leaving the comment here, where it makes no sense, please
move it to the return statement below.

>
> /* We misuse TLB_FLUSH to indicate that we want to clear
> all shadow cache entries */
> if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu))
> kvmppc_mmu_pte_flush(vcpu, 0, 0);
>
> - return r;
> + return 1;
> }
>
> /************* MMU Notifiers *************/

Paul.