Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753462AbaBSKNz (ORCPT ); Wed, 19 Feb 2014 05:13:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22585 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751893AbaBSKNr (ORCPT ); Wed, 19 Feb 2014 05:13:47 -0500 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Greg Kroah-Hartman , Andy King , Dmitry Torokhov , linux-pci@vger.kernel.org Subject: [PATCH] vmw_vmci: Use pci_enable_msix_range() instead of pci_enable_msix() Date: Wed, 19 Feb 2014 11:15:25 +0100 Message-Id: <1392804931-30671-5-git-send-email-agordeev@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As result of deprecation of MSI-X/MSI enablement functions pci_enable_msix() and pci_enable_msi_block() all drivers using these two interfaces need to be updated to use the new pci_enable_msi_range() and pci_enable_msix_range() interfaces. Signed-off-by: Alexander Gordeev Cc: Greg Kroah-Hartman Cc: Andy King Cc: Dmitry Torokhov Cc: linux-pci@vger.kernel.org --- drivers/misc/vmw_vmci/vmci_guest.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c index d35cda0..877ec8a 100644 --- a/drivers/misc/vmw_vmci/vmci_guest.c +++ b/drivers/misc/vmw_vmci/vmci_guest.c @@ -383,13 +383,18 @@ static int vmci_enable_msix(struct pci_dev *pdev, vmci_dev->msix_entries[i].vector = i; } - result = pci_enable_msix(pdev, vmci_dev->msix_entries, VMCI_MAX_INTRS); - if (result == 0) + result = pci_enable_msix_range(pdev, vmci_dev->msix_entries, + VMCI_MAX_INTRS, VMCI_MAX_INTRS); + if (result > 0) { vmci_dev->exclusive_vectors = true; - else if (result > 0) - result = pci_enable_msix(pdev, vmci_dev->msix_entries, 1); + } else if (result == -ENOSPC) { + result = pci_enable_msix_range(pdev, vmci_dev->msix_entries, + 1, 1); + if (result < 0) + return result; + } - return result; + return 0; } /* -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/