From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751327AbdBHS23 (ORCPT ); Wed, 8 Feb 2017 13:28:29 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:34166 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbdBHS2Q (ORCPT ); Wed, 8 Feb 2017 13:28:16 -0500 Date: Wed, 8 Feb 2017 19:27:58 +0100 From: Peter Senna Tschudin To: Romain Perier Cc: Dan Williams , Doug Ledford , Sean Hefty , Hal Rosenstock , jeffrey.t.kirsher@intel.com, "David S. Miller" , stas.yakovlev@gmail.com, "James E.J. Bottomley" , "Martin K. Petersen" , Felipe Balbi , Greg Kroah-Hartman , linux-rdma@vger.kernel.org, netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Senna Tschudin Subject: Re: [RFC 07/19] wireless: ipw2200: Replace PCI pool old API Message-ID: <20170208182758.GG16878@collabora.com> References: <20170208163457.28853-1-romain.perier@collabora.com> <20170208163457.28853-8-romain.perier@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170208163457.28853-8-romain.perier@collabora.com> User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 08, 2017 at 05:34:45PM +0100, Romain Perier wrote: > The PCI pool API is deprecated. This commits replaces the PCI pool old > API by the appropriated function with the DMA pool API. > > Signed-off-by: Romain Perier > --- > drivers/net/wireless/intel/ipw2x00/ipw2200.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c > index 5ef3c5c..6d77870 100644 > --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c > +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c > @@ -3211,7 +3211,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; > > @@ -3228,9 +3228,9 @@ 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); Introduces line over 80 characters warning. Please fix and resubmit. Other than that looks good. Tested by compiling it. > if (!pool) { > - IPW_ERROR("pci_pool_create failed\n"); > + IPW_ERROR("dma_pool_create failed\n"); > kfree(phys); > kfree(virts); > return -ENOMEM; > @@ -3255,7 +3255,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; > @@ -3299,9 +3299,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.9.3 >