Re: [PATCH v3 -tip 3/5] x86, MSI: Minor readability fixes

[Ingo Molnar <mingo@kernel.org>]

* Alexander Gordeev <agordeev@redhat.com> wrote:

> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> ---
>  arch/x86/kernel/apic/io_apic.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
> index 84d632b..0489699 100644
> --- a/arch/x86/kernel/apic/io_apic.c
> +++ b/arch/x86/kernel/apic/io_apic.c
> @@ -3123,7 +3123,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,
>  
>  	if (irq_remapped(cfg)) {
>  		compose_remapped_msi_msg(pdev, irq, dest, msg, hpet_id);
> -		return err;
> +		return 0;
>  	}
>  
>  	if (x2apic_enabled())
> @@ -3150,7 +3150,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,
>  			MSI_DATA_DELIVERY_LOWPRI) |
>  		MSI_DATA_VECTOR(cfg->vector);
>  
> -	return err;
> +	return 0;
>  }
>  
>  static int
> @@ -3232,7 +3232,7 @@ int setup_msix_irqs(struct pci_dev *dev, int nvec)
>  	list_for_each_entry(msidesc, &dev->msi_list, list) {
>  		irq = create_irq_nr(irq_want, node);
>  		if (irq == 0)
> -			return -1;
> +			return -ENOSPC;
>  		irq_want = irq + 1;
>  		if (!irq_remapping_enabled)
>  			goto no_ir;

This should be backported into earlier patches.

Thanks,

	Ingo