提交 28b75415 编写于 作者: R Romain Perier 提交者: Kalle Valo

wireless: ipw2200: Replace PCI pool old API

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: NRomain Perier <romain.perier@collabora.com>
Reviewed-by: NPeter Senna Tschudin <peter.senna@collabora.com>
Acked-by: NStanislav Yakovlev <stas.yakovlev@gmail.com>
Signed-off-by: NKalle Valo <kvalo@codeaurora.org>
上级 2cc8918e
...@@ -3209,7 +3209,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len) ...@@ -3209,7 +3209,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
struct fw_chunk *chunk; struct fw_chunk *chunk;
int total_nr = 0; int total_nr = 0;
int i; int i;
struct pci_pool *pool; struct dma_pool *pool;
void **virts; void **virts;
dma_addr_t *phys; dma_addr_t *phys;
...@@ -3226,9 +3226,10 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len) ...@@ -3226,9 +3226,10 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
kfree(virts); kfree(virts);
return -ENOMEM; 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) { if (!pool) {
IPW_ERROR("pci_pool_create failed\n"); IPW_ERROR("dma_pool_create failed\n");
kfree(phys); kfree(phys);
kfree(virts); kfree(virts);
return -ENOMEM; return -ENOMEM;
...@@ -3253,7 +3254,7 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len) ...@@ -3253,7 +3254,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; nr = (chunk_len + CB_MAX_LENGTH - 1) / CB_MAX_LENGTH;
for (i = 0; i < nr; i++) { 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]); &phys[total_nr]);
if (!virts[total_nr]) { if (!virts[total_nr]) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -3297,9 +3298,9 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len) ...@@ -3297,9 +3298,9 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
} }
out: out:
for (i = 0; i < total_nr; i++) 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(phys);
kfree(virts); kfree(virts);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册