crypto: ccp - Use pci_enable_msix_range() instead of pci_enable_msix()
authorAlexander Gordeev <agordeev@redhat.com>
Tue, 15 Apr 2014 07:54:31 +0000 (09:54 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 16 Apr 2014 12:40:17 +0000 (20:40 +0800)
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()  or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/ccp/ccp-pci.c

index 93319f9..0d74623 100644 (file)
@@ -48,12 +48,11 @@ static int ccp_get_msix_irqs(struct ccp_device *ccp)
        for (v = 0; v < ARRAY_SIZE(msix_entry); v++)
                msix_entry[v].entry = v;
 
-       while ((ret = pci_enable_msix(pdev, msix_entry, v)) > 0)
-               v = ret;
-       if (ret)
+       ret = pci_enable_msix_range(pdev, msix_entry, 1, v);
+       if (ret < 0)
                return ret;
 
-       ccp_pci->msix_count = v;
+       ccp_pci->msix_count = ret;
        for (v = 0; v < ccp_pci->msix_count; v++) {
                /* Set the interrupt names and request the irqs */
                snprintf(ccp_pci->msix[v].name, name_len, "ccp-%u", v);