lkml.org 
[lkml]   [2017]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v13 3/5] net: e100: Replace PCI pool old API
    Date
    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>
    Acked-by: Peter Senna Tschudin <peter.senna@collabora.com>
    Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Tested-by: Peter Senna Tschudin <peter.senna@collabora.com>
    ---
    drivers/net/ethernet/intel/e100.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
    index 4d10270ddf8f..d1470d30351c 100644
    --- a/drivers/net/ethernet/intel/e100.c
    +++ b/drivers/net/ethernet/intel/e100.c
    @@ -607,7 +607,7 @@ struct nic {
    struct mem *mem;
    dma_addr_t dma_addr;

    - struct pci_pool *cbs_pool;
    + struct dma_pool *cbs_pool;
    dma_addr_t cbs_dma_addr;
    u8 adaptive_ifs;
    u8 tx_threshold;
    @@ -1892,7 +1892,7 @@ static void e100_clean_cbs(struct nic *nic)
    nic->cb_to_clean = nic->cb_to_clean->next;
    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_avail = 0;
    }
    @@ -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->cbs_avail = 0;

    - nic->cbs = pci_pool_alloc(nic->cbs_pool, GFP_KERNEL,
    + nic->cbs = dma_pool_alloc(nic->cbs_pool, GFP_KERNEL,
    &nic->cbs_dma_addr);
    if (!nic->cbs)
    return -ENOMEM;
    @@ -2961,8 +2961,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");
    goto err_out_free;
    }
    - nic->cbs_pool = pci_pool_create(netdev->name,
    - nic->pdev,
    + nic->cbs_pool = dma_pool_create(netdev->name,
    + &nic->pdev->dev,
    nic->params.cbs.max * sizeof(struct cb),
    sizeof(u32),
    0);
    @@ -3002,7 +3002,7 @@ static void e100_remove(struct pci_dev *pdev)
    unregister_netdev(netdev);
    e100_free(nic);
    pci_iounmap(pdev, nic->csr);
    - pci_pool_destroy(nic->cbs_pool);
    + dma_pool_destroy(nic->cbs_pool);
    free_netdev(netdev);
    pci_release_regions(pdev);
    pci_disable_device(pdev);
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-09-06 11:11    [W:4.392 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site