Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1595361 > unrolled thread
| Started by | Romain Perier <romain.perier@collabora.com> |
|---|---|
| First post | 2017-03-08 17:40 +0100 |
| Last post | 2017-03-08 17:40 +0100 |
| Articles | 7 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH v5 00/19] Replace PCI pool by DMA pool API Romain Perier <romain.perier@collabora.com> - 2017-03-08 17:40 +0100
[PATCH v5 03/19] IB/mthca: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-08 17:40 +0100
[PATCH v5 04/19] net: e100: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-08 17:40 +0100
Re: [PATCH v5 04/19] net: e100: Replace PCI pool old API Jeff Kirsher <jeffrey.t.kirsher@intel.com> - 2017-03-08 23:50 +0100
Re: [PATCH v5 04/19] net: e100: Replace PCI pool old API Peter Senna Tschudin <peter.senna@collabora.com> - 2017-03-09 08:20 +0100
Re: [PATCH v5 04/19] net: e100: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-09 11:00 +0100
[PATCH v5 02/19] dmaengine: pch_dma: Replace PCI pool old API Romain Perier <romain.perier@collabora.com> - 2017-03-08 17:40 +0100
| From | Romain Perier <romain.perier@collabora.com> |
|---|---|
| Date | 2017-03-08 17:40 +0100 |
| Subject | [PATCH v5 00/19] Replace PCI pool by DMA pool API |
| Message-ID | <tiMDn-Dj-5@gated-at.bofh.it> |
The current PCI pool API are simple macro functions direct expanded to the appropriate dma pool functions. The prototypes are almost the same and semantically, they are very similar. I propose to use the DMA pool API directly and get rid of the old API. This set of patches, replaces the old API by the dma pool API and remove the defines. Changes in v5: - Re-worded the cover letter (remove sentence about checkpatch.pl) - Rebased series onto next-20170308 - Fix typos in commit message - Added Acked-by Tags Changes in v4: - Rebased series onto next-20170301 - Removed patch 20/20: checks done by checkpath.pl, no longer required. Thanks to Peter and Joe for their feedbacks. - Added Reviewed-by tags Changes in v3: - Rebased series onto next-20170224 - Fix checkpath.pl reports for patch 11/20 and patch 12/20 - Remove prefix RFC Changes in v2: - Introduced patch 18/20 - Fixed cosmetic changes: spaces before brace, live over 80 characters - Removed some of the check for NULL pointers before calling dma_pool_destroy - Improved the regexp in checkpatch for pci_pool, thanks to Joe Perches - Added Tested-by and Acked-by tags Romain Perier (19): block: DAC960: Replace PCI pool old API dmaengine: pch_dma: Replace PCI pool old API IB/mthca: Replace PCI pool old API net: e100: Replace PCI pool old API mlx4: Replace PCI pool old API mlx5: Replace PCI pool old API wireless: ipw2200: Replace PCI pool old API scsi: be2iscsi: Replace PCI pool old API scsi: csiostor: Replace PCI pool old API scsi: lpfc: Replace PCI pool old API scsi: megaraid: Replace PCI pool old API scsi: mpt3sas: Replace PCI pool old API scsi: mvsas: Replace PCI pool old API scsi: pmcraid: Replace PCI pool old API usb: gadget: amd5536udc: Replace PCI pool old API usb: gadget: net2280: Replace PCI pool old API usb: gadget: pch_udc: Replace PCI pool old API usb: host: Remove remaining pci_pool in comments PCI: Remove PCI pool macro functions drivers/block/DAC960.c | 36 ++++----- drivers/block/DAC960.h | 4 +- drivers/dma/pch_dma.c | 12 +-- drivers/infiniband/hw/mthca/mthca_av.c | 10 +-- drivers/infiniband/hw/mthca/mthca_cmd.c | 8 +- drivers/infiniband/hw/mthca/mthca_dev.h | 4 +- drivers/net/ethernet/intel/e100.c | 12 +-- drivers/net/ethernet/mellanox/mlx4/cmd.c | 10 +-- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 +-- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 13 ++-- drivers/scsi/be2iscsi/be_iscsi.c | 6 +- drivers/scsi/be2iscsi/be_main.c | 6 +- drivers/scsi/be2iscsi/be_main.h | 2 +- drivers/scsi/csiostor/csio_hw.h | 2 +- drivers/scsi/csiostor/csio_init.c | 11 +-- drivers/scsi/csiostor/csio_scsi.c | 6 +- drivers/scsi/lpfc/lpfc.h | 14 ++-- drivers/scsi/lpfc/lpfc_init.c | 16 ++-- drivers/scsi/lpfc/lpfc_mem.c | 106 +++++++++++++------------- drivers/scsi/lpfc/lpfc_nvme.c | 6 +- drivers/scsi/lpfc/lpfc_nvmet.c | 4 +- drivers/scsi/lpfc/lpfc_scsi.c | 12 +-- drivers/scsi/megaraid/megaraid_mbox.c | 33 ++++---- drivers/scsi/megaraid/megaraid_mm.c | 32 ++++---- drivers/scsi/megaraid/megaraid_sas_base.c | 29 +++---- drivers/scsi/megaraid/megaraid_sas_fusion.c | 66 ++++++++-------- drivers/scsi/mpt3sas/mpt3sas_base.c | 73 +++++++++--------- drivers/scsi/mvsas/mv_init.c | 6 +- drivers/scsi/mvsas/mv_sas.c | 6 +- drivers/scsi/pmcraid.c | 10 +-- drivers/scsi/pmcraid.h | 2 +- drivers/usb/gadget/udc/amd5536udc.c | 8 +- drivers/usb/gadget/udc/amd5536udc.h | 4 +- drivers/usb/gadget/udc/net2280.c | 12 +-- drivers/usb/gadget/udc/net2280.h | 2 +- drivers/usb/gadget/udc/pch_udc.c | 31 ++++---- drivers/usb/host/ehci-hcd.c | 2 +- drivers/usb/host/fotg210-hcd.c | 2 +- drivers/usb/host/oxu210hp-hcd.c | 2 +- include/linux/mlx5/driver.h | 2 +- include/linux/pci.h | 9 --- 42 files changed, 311 insertions(+), 333 deletions(-) -- 2.9.3
[toc] | [next] | [standalone]
| From | Romain Perier <romain.perier@collabora.com> |
|---|---|
| Date | 2017-03-08 17:40 +0100 |
| Subject | [PATCH v5 03/19] IB/mthca: Replace PCI pool old API |
| Message-ID | <tiMN4-GJ-21@gated-at.bofh.it> |
| In reply to | #1595361 |
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>
Tested-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
drivers/infiniband/hw/mthca/mthca_av.c | 10 +++++-----
drivers/infiniband/hw/mthca/mthca_cmd.c | 8 ++++----
drivers/infiniband/hw/mthca/mthca_dev.h | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c
index c9f0f36..9d041b6 100644
--- a/drivers/infiniband/hw/mthca/mthca_av.c
+++ b/drivers/infiniband/hw/mthca/mthca_av.c
@@ -186,7 +186,7 @@ int mthca_create_ah(struct mthca_dev *dev,
on_hca_fail:
if (ah->type == MTHCA_AH_PCI_POOL) {
- ah->av = pci_pool_zalloc(dev->av_table.pool,
+ ah->av = dma_pool_zalloc(dev->av_table.pool,
GFP_ATOMIC, &ah->avdma);
if (!ah->av)
return -ENOMEM;
@@ -245,7 +245,7 @@ int mthca_destroy_ah(struct mthca_dev *dev, struct mthca_ah *ah)
break;
case MTHCA_AH_PCI_POOL:
- pci_pool_free(dev->av_table.pool, ah->av, ah->avdma);
+ dma_pool_free(dev->av_table.pool, ah->av, ah->avdma);
break;
case MTHCA_AH_KMALLOC:
@@ -333,7 +333,7 @@ int mthca_init_av_table(struct mthca_dev *dev)
if (err)
return err;
- dev->av_table.pool = pci_pool_create("mthca_av", dev->pdev,
+ dev->av_table.pool = dma_pool_create("mthca_av", &dev->pdev->dev,
MTHCA_AV_SIZE,
MTHCA_AV_SIZE, 0);
if (!dev->av_table.pool)
@@ -353,7 +353,7 @@ int mthca_init_av_table(struct mthca_dev *dev)
return 0;
out_free_pool:
- pci_pool_destroy(dev->av_table.pool);
+ dma_pool_destroy(dev->av_table.pool);
out_free_alloc:
mthca_alloc_cleanup(&dev->av_table.alloc);
@@ -367,6 +367,6 @@ void mthca_cleanup_av_table(struct mthca_dev *dev)
if (dev->av_table.av_map)
iounmap(dev->av_table.av_map);
- pci_pool_destroy(dev->av_table.pool);
+ dma_pool_destroy(dev->av_table.pool);
mthca_alloc_cleanup(&dev->av_table.alloc);
}
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index c7f49bb..7f219c8 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -530,7 +530,7 @@ int mthca_cmd_init(struct mthca_dev *dev)
return -ENOMEM;
}
- dev->cmd.pool = pci_pool_create("mthca_cmd", dev->pdev,
+ dev->cmd.pool = dma_pool_create("mthca_cmd", &dev->pdev->dev,
MTHCA_MAILBOX_SIZE,
MTHCA_MAILBOX_SIZE, 0);
if (!dev->cmd.pool) {
@@ -543,7 +543,7 @@ int mthca_cmd_init(struct mthca_dev *dev)
void mthca_cmd_cleanup(struct mthca_dev *dev)
{
- pci_pool_destroy(dev->cmd.pool);
+ dma_pool_destroy(dev->cmd.pool);
iounmap(dev->hcr);
if (dev->cmd.flags & MTHCA_CMD_POST_DOORBELLS)
iounmap(dev->cmd.dbell_map);
@@ -613,7 +613,7 @@ struct mthca_mailbox *mthca_alloc_mailbox(struct mthca_dev *dev,
if (!mailbox)
return ERR_PTR(-ENOMEM);
- mailbox->buf = pci_pool_alloc(dev->cmd.pool, gfp_mask, &mailbox->dma);
+ mailbox->buf = dma_pool_alloc(dev->cmd.pool, gfp_mask, &mailbox->dma);
if (!mailbox->buf) {
kfree(mailbox);
return ERR_PTR(-ENOMEM);
@@ -627,7 +627,7 @@ void mthca_free_mailbox(struct mthca_dev *dev, struct mthca_mailbox *mailbox)
if (!mailbox)
return;
- pci_pool_free(dev->cmd.pool, mailbox->buf, mailbox->dma);
+ dma_pool_free(dev->cmd.pool, mailbox->buf, mailbox->dma);
kfree(mailbox);
}
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index 4393a02..8c3f6ed 100644
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -118,7 +118,7 @@ enum {
};
struct mthca_cmd {
- struct pci_pool *pool;
+ struct dma_pool *pool;
struct mutex hcr_mutex;
struct semaphore poll_sem;
struct semaphore event_sem;
@@ -263,7 +263,7 @@ struct mthca_qp_table {
};
struct mthca_av_table {
- struct pci_pool *pool;
+ struct dma_pool *pool;
int num_ddr_avs;
u64 ddr_av_base;
void __iomem *av_map;
--
2.9.3
[toc] | [prev] | [next] | [standalone]
| From | Romain Perier <romain.perier@collabora.com> |
|---|---|
| Date | 2017-03-08 17:40 +0100 |
| Subject | [PATCH v5 04/19] net: e100: Replace PCI pool old API |
| Message-ID | <tiMN4-GJ-35@gated-at.bofh.it> |
| In reply to | #1595361 |
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>
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 2b7323d..d1002c2 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;
@@ -2958,8 +2958,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);
@@ -2999,7 +2999,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.9.3
[toc] | [prev] | [next] | [standalone]
| From | Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
|---|---|
| Date | 2017-03-08 23:50 +0100 |
| Subject | Re: [PATCH v5 04/19] net: e100: Replace PCI pool old API |
| Message-ID | <tiSz8-4xu-19@gated-at.bofh.it> |
| In reply to | #1595369 |
[Multipart message — attachments visible in raw view] — view raw
On Wed, 2017-03-08 at 17:19 +0100, Romain Perier wrote: > 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> > Tested-by: Peter Senna Tschudin <peter.senna@collabora.com> > --- > drivers/net/ethernet/intel/e100.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> My only concern is: - what hardware did this get tested with? Since this affects all e100 parts, it would be hard to believe that all the affected hardware was used in testing.
[toc] | [prev] | [next] | [standalone]
| From | Peter Senna Tschudin <peter.senna@collabora.com> |
|---|---|
| Date | 2017-03-09 08:20 +0100 |
| Subject | Re: [PATCH v5 04/19] net: e100: Replace PCI pool old API |
| Message-ID | <tj0wF-1HW-5@gated-at.bofh.it> |
| In reply to | #1595565 |
On Wed, Mar 08, 2017 at 02:40:25PM -0800, Jeff Kirsher wrote: > On Wed, 2017-03-08 at 17:19 +0100, Romain Perier wrote: > > 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> > > Tested-by: Peter Senna Tschudin <peter.senna@collabora.com> > > --- > > drivers/net/ethernet/intel/e100.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > > My only concern is: > - what hardware did this get tested with? Since this affects all e100 > parts, it would be hard to believe that all the affected hardware was > used in testing. This was tested by compilation only(See https://lkml.org/lkml/2017/2/8/661). However this series removes macro definitions of the old pci_pool interface and replace call sites by what the macra was calling. Here are the macros that this series removes from include/pci.h: #define pci_pool dma_pool #define pci_pool_create(name, pdev, size, align, allocation) \ dma_pool_create(name, &pdev->dev, size, align, allocation) #define pci_pool_destroy(pool) dma_pool_destroy(pool) #define pci_pool_alloc(pool, flags, handle) dma_pool_alloc(pool, flags, handle) #define pci_pool_zalloc(pool, flags, handle) \ dma_pool_zalloc(pool, flags, handle) #define pci_pool_free(pool, vaddr, addr) dma_pool_free(pool, vaddr, add So this should not affect run time.
[toc] | [prev] | [next] | [standalone]
| From | Romain Perier <romain.perier@collabora.com> |
|---|---|
| Date | 2017-03-09 11:00 +0100 |
| Subject | Re: [PATCH v5 04/19] net: e100: Replace PCI pool old API |
| Message-ID | <tj31w-3pp-27@gated-at.bofh.it> |
| In reply to | #1595726 |
Hello, Le 09/03/2017 à 08:01, Peter Senna Tschudin a écrit : > On Wed, Mar 08, 2017 at 02:40:25PM -0800, Jeff Kirsher wrote: >> On Wed, 2017-03-08 at 17:19 +0100, Romain Perier wrote: >>> 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> >>> Tested-by: Peter Senna Tschudin <peter.senna@collabora.com> >>> --- >>> drivers/net/ethernet/intel/e100.c | 12 ++++++------ >>> 1 file changed, 6 insertions(+), 6 deletions(-) >> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> >> >> My only concern is: >> - what hardware did this get tested with? Since this affects all e100 >> parts, it would be hard to believe that all the affected hardware was >> used in testing. > This was tested by compilation only(See > https://lkml.org/lkml/2017/2/8/661). However this series removes macro > definitions of the old pci_pool interface and replace call sites by what > the macra was calling. > > Here are the macros that this series removes from include/pci.h: > > #define pci_pool dma_pool > #define pci_pool_create(name, pdev, size, align, allocation) \ > dma_pool_create(name, &pdev->dev, size, align, allocation) > #define pci_pool_destroy(pool) dma_pool_destroy(pool) > #define pci_pool_alloc(pool, flags, handle) dma_pool_alloc(pool, flags, handle) > #define pci_pool_zalloc(pool, flags, handle) \ > dma_pool_zalloc(pool, flags, handle) > #define pci_pool_free(pool, vaddr, addr) dma_pool_free(pool, vaddr, add > > So this should not affect run time. We cannot test a patch like this one on all affected platforms/drivers (at runtime). Simply because we have not the hw. As Peter said, we tested this by compilation only for now via make allyesconfig. That's up to the maintainer of the subsystem to test and ack this, imho. I agree with Peter, this should not affect runtime (as semantically it's compatible and have been validated statically and semantically by your compiler) Regards, Romain
[toc] | [prev] | [next] | [standalone]
| From | Romain Perier <romain.perier@collabora.com> |
|---|---|
| Date | 2017-03-08 17:40 +0100 |
| Subject | [PATCH v5 02/19] dmaengine: pch_dma: Replace PCI pool old API |
| Message-ID | <tiMN5-GJ-45@gated-at.bofh.it> |
| In reply to | #1595361 |
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>
Tested-by: Peter Senna Tschudin <peter.senna@collabora.com>
---
drivers/dma/pch_dma.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index f9028e9..afd8f27 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -123,7 +123,7 @@ struct pch_dma_chan {
struct pch_dma {
struct dma_device dma;
void __iomem *membase;
- struct pci_pool *pool;
+ struct dma_pool *pool;
struct pch_dma_regs regs;
struct pch_dma_desc_regs ch_regs[MAX_CHAN_NR];
struct pch_dma_chan channels[MAX_CHAN_NR];
@@ -437,7 +437,7 @@ static struct pch_dma_desc *pdc_alloc_desc(struct dma_chan *chan, gfp_t flags)
struct pch_dma *pd = to_pd(chan->device);
dma_addr_t addr;
- desc = pci_pool_zalloc(pd->pool, flags, &addr);
+ desc = dma_pool_zalloc(pd->pool, flags, &addr);
if (desc) {
INIT_LIST_HEAD(&desc->tx_list);
dma_async_tx_descriptor_init(&desc->txd, chan);
@@ -549,7 +549,7 @@ static void pd_free_chan_resources(struct dma_chan *chan)
spin_unlock_irq(&pd_chan->lock);
list_for_each_entry_safe(desc, _d, &tmp_list, desc_node)
- pci_pool_free(pd->pool, desc, desc->txd.phys);
+ dma_pool_free(pd->pool, desc, desc->txd.phys);
pdc_enable_irq(chan, 0);
}
@@ -880,7 +880,7 @@ static int pch_dma_probe(struct pci_dev *pdev,
goto err_iounmap;
}
- pd->pool = pci_pool_create("pch_dma_desc_pool", pdev,
+ pd->pool = dma_pool_create("pch_dma_desc_pool", &pdev->dev,
sizeof(struct pch_dma_desc), 4, 0);
if (!pd->pool) {
dev_err(&pdev->dev, "Failed to alloc DMA descriptors\n");
@@ -931,7 +931,7 @@ static int pch_dma_probe(struct pci_dev *pdev,
return 0;
err_free_pool:
- pci_pool_destroy(pd->pool);
+ dma_pool_destroy(pd->pool);
err_free_irq:
free_irq(pdev->irq, pd);
err_iounmap:
@@ -963,7 +963,7 @@ static void pch_dma_remove(struct pci_dev *pdev)
tasklet_kill(&pd_chan->tasklet);
}
- pci_pool_destroy(pd->pool);
+ dma_pool_destroy(pd->pool);
pci_iounmap(pdev, pd->membase);
pci_release_regions(pdev);
pci_disable_device(pdev);
--
2.9.3
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web