[PATCH v2 07/54] KVM: arm/arm64: vgic: Remove irq_phys_map from interface

[Tom Hanson]

On 04/28/2016 10:45 AM, Andre Przywara wrote:
...
> diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
> index 3a74b17..9475000 100644
> --- a/virt/kvm/arm/arch_timer.c
> +++ b/virt/kvm/arm/arch_timer.c
> @@ -333,10 +333,10 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
...
> +	ret = kvm_vgic_map_phys_irq(vcpu, irq->irq, phys_irq);
> +	if (ret)
> +		return ret;
>
>   	return 0;
>   }

This isn't wrong, but it is overly complicated.  I'd recommend either:
     ret = kvm_vgic_map_phys_irq(vcpu, irq->irq, phys_irq);
     return ret;
OR
     return kvm_vgic_map_phys_irq(vcpu, irq->irq, phys_irq);