Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1604040
| From | Romain Perier <romain.perier@collabora.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v6 07/15] wireless: ipw2200: Replace PCI pool old API |
| Date | 2017-03-19 18:10 +0100 |
| Message-ID | <tmMv8-oz-25@gated-at.bofh.it> (permalink) |
| References | <tmMv8-oz-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
The PCI pool API is deprecated. This commit replaces the PCI pool old
API by the appropriate function with the DMA pool API.
Signed-off-by: Romain Perier <romain.perier@collabora.com>
Reviewed-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
drivers/net/wireless/intel/ipw2x00/ipw2200.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index 5ef3c5c..93dfe47 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -3211,7 +3211,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
struct fw_chunk *chunk;
int total_nr = 0;
int i;
- struct pci_pool *pool;
+ struct dma_pool *pool;
void **virts;
dma_addr_t *phys;
@@ -3228,9 +3228,10 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
kfree(virts);
return -ENOMEM;
}
- pool = pci_pool_create("ipw2200", priv->pci_dev, CB_MAX_LENGTH, 0, 0);
+ pool = dma_pool_create("ipw2200", &priv->pci_dev->dev, CB_MAX_LENGTH, 0,
+ 0);
if (!pool) {
- IPW_ERROR("pci_pool_create failed\n");
+ IPW_ERROR("dma_pool_create failed\n");
kfree(phys);
kfree(virts);
return -ENOMEM;
@@ -3255,7 +3256,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
nr = (chunk_len + CB_MAX_LENGTH - 1) / CB_MAX_LENGTH;
for (i = 0; i < nr; i++) {
- virts[total_nr] = pci_pool_alloc(pool, GFP_KERNEL,
+ virts[total_nr] = dma_pool_alloc(pool, GFP_KERNEL,
&phys[total_nr]);
if (!virts[total_nr]) {
ret = -ENOMEM;
@@ -3299,9 +3300,9 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
}
out:
for (i = 0; i < total_nr; i++)
- pci_pool_free(pool, virts[i], phys[i]);
+ dma_pool_free(pool, virts[i], phys[i]);
- pci_pool_destroy(pool);
+ dma_pool_destroy(pool);
kfree(phys);
kfree(virts);
--
2.9.3
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v6 00/15] Replace PCI pool by DMA pool API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 10/15] scsi: lpfc: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 06/15] mlx5: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
Re: [PATCH v6 06/15] mlx5: Replace PCI pool old API Leon Romanovsky <leon@kernel.org> - 2017-03-20 07:40 +0100
Re: [PATCH v6 06/15] mlx5: Replace PCI pool old API Doug Ledford <dledford@redhat.com> - 2017-03-25 04:50 +0100
[PATCH v6 04/15] net: e100: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 08/15] scsi: be2iscsi: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 02/15] dmaengine: pch_dma: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 07/15] wireless: ipw2200: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 11/15] scsi: megaraid: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 13/15] scsi: mvsas: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 03/15] IB/mthca: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
Re: [PATCH v6 03/15] IB/mthca: Replace PCI pool old API Doug Ledford <dledford@redhat.com> - 2017-03-25 06:30 +0100
[PATCH v6 12/15] scsi: mpt3sas: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 09/15] scsi: csiostor: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 01/15] block: DAC960: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:10 +0100
[PATCH v6 14/15] scsi: pmcraid: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:20 +0100
[PATCH v6 15/15] PCI: Remove PCI pool macro functions Romain Perier <romain.perier@collabora.com> - 2017-03-19 18:20 +0100
csiph-web