aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorAlexander Gordeev <agordeev@redhat.com>2014-04-15 03:54:31 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2014-04-16 08:40:17 -0400
commit5347ee8eff1965f5a63a3da4a13aa92aed3e682d (patch)
treed1c0a7e85f3d0739790c99b8f0c0c4c391e8ad30 /drivers/crypto
parent950e4e1c1b334c4975b91106f23fd343be3eb7a0 (diff)
crypto: ccp - Use pci_enable_msix_range() instead of pci_enable_msix()
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>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/ccp/ccp-pci.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/crypto/ccp/ccp-pci.c b/drivers/crypto/ccp/ccp-pci.c
index 93319f9db753..0d746236df5e 100644
--- a/drivers/crypto/ccp/ccp-pci.c
+++ b/drivers/crypto/ccp/ccp-pci.c
@@ -48,12 +48,11 @@ static int ccp_get_msix_irqs(struct ccp_device *ccp)
48 for (v = 0; v < ARRAY_SIZE(msix_entry); v++) 48 for (v = 0; v < ARRAY_SIZE(msix_entry); v++)
49 msix_entry[v].entry = v; 49 msix_entry[v].entry = v;
50 50
51 while ((ret = pci_enable_msix(pdev, msix_entry, v)) > 0) 51 ret = pci_enable_msix_range(pdev, msix_entry, 1, v);
52 v = ret; 52 if (ret < 0)
53 if (ret)
54 return ret; 53 return ret;
55 54
56 ccp_pci->msix_count = v; 55 ccp_pci->msix_count = ret;
57 for (v = 0; v < ccp_pci->msix_count; v++) { 56 for (v = 0; v < ccp_pci->msix_count; v++) {
58 /* Set the interrupt names and request the irqs */ 57 /* Set the interrupt names and request the irqs */
59 snprintf(ccp_pci->msix[v].name, name_len, "ccp-%u", v); 58 snprintf(ccp_pci->msix[v].name, name_len, "ccp-%u", v);