From: Romain Perier <romain.perier@collabora.com>
To: Dan Williams <dan.j.williams@intel.com>,
Doug Ledford <dledford@redhat.com>,
Sean Hefty <sean.hefty@intel.com>,
Hal Rosenstock <hal.rosenstock@gmail.com>,
jeffrey.t.kirsher@intel.com,
"David S. Miller" <davem@davemloft.net>,
stas.yakovlev@gmail.com,
"James E.J. Bottomley" <jejb@linux.vnet.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Felipe Balbi <balbi@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-rdma@vger.kernel.org, netdev@vger.kernel.org,
linux-usb@vger.kernel.org, linux-scsi@vger.kernel.org,
linux-kernel@vger.kernel.org,
Romain Perier <romain.perier@collabora.com>
Subject: [PATCH v10 07/15] wireless: ipw2200: Replace PCI pool old API
Date: Thu, 6 Jul 2017 10:13:02 +0200 [thread overview]
Message-ID: <20170706081310.30964-8-romain.perier@collabora.com> (raw)
In-Reply-To: <20170706081310.30964-1-romain.perier@collabora.com>
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 9368abdf18e2..ac73436bc1c8 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -3209,7 +3209,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;
@@ -3226,9 +3226,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;
@@ -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;
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;
@@ -3297,9 +3298,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.11.0
next prev parent reply other threads:[~2017-07-06 8:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-06 8:12 [PATCH v10 00/15] Replace PCI pool by DMA pool API Romain Perier
2017-07-06 8:12 ` [PATCH v10 01/15] block: DAC960: Replace PCI pool old API Romain Perier
2017-07-06 8:12 ` [PATCH v10 02/15] dmaengine: pch_dma: " Romain Perier
2017-07-06 8:12 ` [PATCH v10 03/15] IB/mthca: " Romain Perier
2017-07-06 8:12 ` [PATCH v10 04/15] net: e100: " Romain Perier
2017-07-06 8:13 ` [PATCH v10 05/15] mlx4: " Romain Perier
2017-07-06 8:13 ` [PATCH v10 06/15] mlx5: " Romain Perier
2017-07-06 8:13 ` Romain Perier [this message]
2017-07-06 8:13 ` [PATCH v10 08/15] scsi: be2iscsi: " Romain Perier
2017-07-06 8:13 ` [PATCH v10 09/15] scsi: csiostor: " Romain Perier
2017-07-06 8:13 ` [PATCH v10 10/15] scsi: lpfc: " Romain Perier
2017-07-06 8:13 ` [PATCH v10 11/15] scsi: megaraid: " Romain Perier
2017-07-06 8:13 ` [PATCH v10 12/15] scsi: mpt3sas: " Romain Perier
2017-07-06 8:13 ` [PATCH v10 13/15] scsi: mvsas: " Romain Perier
2017-07-06 8:13 ` [PATCH v10 14/15] scsi: pmcraid: " Romain Perier
2017-07-06 8:13 ` [PATCH v10 15/15] PCI: Remove PCI pool macro functions Romain Perier
2017-07-09 21:30 ` [PATCH v10 00/15] Replace PCI pool by DMA pool API Doug Ledford
2017-07-18 11:47 ` Romain Perier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170706081310.30964-8-romain.perier@collabora.com \
--to=romain.perier@collabora.com \
--cc=balbi@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hal.rosenstock@gmail.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=netdev@vger.kernel.org \
--cc=sean.hefty@intel.com \
--cc=stas.yakovlev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).