General function loongarch_eiointc_read() will be used for 1/2/4/8 bytes read access, it comes from loongarch_eiointc_readq(). Here rename function loongarch_eiointc_readq() with loongarch_eiointc_read(). Signed-off-by: Bibo Mao <maobibo@xxxxxxxxxxx> --- arch/loongarch/kvm/intc/eiointc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/loongarch/kvm/intc/eiointc.c b/arch/loongarch/kvm/intc/eiointc.c index 137cd3adca80..e169b96b7e5c 100644 --- a/arch/loongarch/kvm/intc/eiointc.c +++ b/arch/loongarch/kvm/intc/eiointc.c @@ -256,8 +256,8 @@ static int loongarch_eiointc_readl(struct kvm_vcpu *vcpu, struct loongarch_eioin return ret; } -static int loongarch_eiointc_readq(struct kvm_vcpu *vcpu, struct loongarch_eiointc *s, - gpa_t addr, void *val) +static int loongarch_eiointc_read(struct kvm_vcpu *vcpu, struct loongarch_eiointc *s, + gpa_t addr, unsigned long *val) { int index, ret = 0; u64 data = 0; @@ -293,7 +293,7 @@ static int loongarch_eiointc_readq(struct kvm_vcpu *vcpu, struct loongarch_eioin ret = -EINVAL; break; } - *(u64 *)val = data; + *val = data; return ret; } @@ -303,7 +303,7 @@ static int kvm_eiointc_read(struct kvm_vcpu *vcpu, gpa_t addr, int len, void *val) { int ret = -EINVAL; - unsigned long flags; + unsigned long flags, data; struct loongarch_eiointc *eiointc = vcpu->kvm->arch.eiointc; if (!eiointc) { @@ -329,7 +329,8 @@ static int kvm_eiointc_read(struct kvm_vcpu *vcpu, ret = loongarch_eiointc_readl(vcpu, eiointc, addr, val); break; default: - ret = loongarch_eiointc_readq(vcpu, eiointc, addr, val); + ret = loongarch_eiointc_read(vcpu, eiointc, addr, &data); + *(u64 *)val = data; break; } spin_unlock_irqrestore(&eiointc->lock, flags); -- 2.39.3