Commit 5b382431 authored by Romain Perier's avatar Romain Perier Committed by Bjorn Helgaas

net: e100: Replace PCI pool old API

The PCI pool API is deprecated.  Replace the PCI pool old API by the
appropriate function with the DMA pool API.
Tested-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Signed-off-by: default avatarRomain Perier <romain.perier@collabora.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarPeter Senna Tschudin <peter.senna@collabora.com>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4695a1ad
...@@ -607,7 +607,7 @@ struct nic { ...@@ -607,7 +607,7 @@ struct nic {
struct mem *mem; struct mem *mem;
dma_addr_t dma_addr; dma_addr_t dma_addr;
struct pci_pool *cbs_pool; struct dma_pool *cbs_pool;
dma_addr_t cbs_dma_addr; dma_addr_t cbs_dma_addr;
u8 adaptive_ifs; u8 adaptive_ifs;
u8 tx_threshold; u8 tx_threshold;
...@@ -1892,7 +1892,7 @@ static void e100_clean_cbs(struct nic *nic) ...@@ -1892,7 +1892,7 @@ static void e100_clean_cbs(struct nic *nic)
nic->cb_to_clean = nic->cb_to_clean->next; nic->cb_to_clean = nic->cb_to_clean->next;
nic->cbs_avail++; nic->cbs_avail++;
} }
pci_pool_free(nic->cbs_pool, nic->cbs, nic->cbs_dma_addr); dma_pool_free(nic->cbs_pool, nic->cbs, nic->cbs_dma_addr);
nic->cbs = NULL; nic->cbs = NULL;
nic->cbs_avail = 0; nic->cbs_avail = 0;
} }
...@@ -1910,7 +1910,7 @@ static int e100_alloc_cbs(struct nic *nic) ...@@ -1910,7 +1910,7 @@ static int e100_alloc_cbs(struct nic *nic)
nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL; nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL;
nic->cbs_avail = 0; nic->cbs_avail = 0;
nic->cbs = pci_pool_zalloc(nic->cbs_pool, GFP_KERNEL, nic->cbs = dma_pool_zalloc(nic->cbs_pool, GFP_KERNEL,
&nic->cbs_dma_addr); &nic->cbs_dma_addr);
if (!nic->cbs) if (!nic->cbs)
return -ENOMEM; return -ENOMEM;
...@@ -2960,8 +2960,8 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2960,8 +2960,8 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
netif_err(nic, probe, nic->netdev, "Cannot register net device, aborting\n"); netif_err(nic, probe, nic->netdev, "Cannot register net device, aborting\n");
goto err_out_free; goto err_out_free;
} }
nic->cbs_pool = pci_pool_create(netdev->name, nic->cbs_pool = dma_pool_create(netdev->name,
nic->pdev, &nic->pdev->dev,
nic->params.cbs.max * sizeof(struct cb), nic->params.cbs.max * sizeof(struct cb),
sizeof(u32), sizeof(u32),
0); 0);
...@@ -3001,7 +3001,7 @@ static void e100_remove(struct pci_dev *pdev) ...@@ -3001,7 +3001,7 @@ static void e100_remove(struct pci_dev *pdev)
unregister_netdev(netdev); unregister_netdev(netdev);
e100_free(nic); e100_free(nic);
pci_iounmap(pdev, nic->csr); pci_iounmap(pdev, nic->csr);
pci_pool_destroy(nic->cbs_pool); dma_pool_destroy(nic->cbs_pool);
free_netdev(netdev); free_netdev(netdev);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment