From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Senna Tschudin Subject: Re: [RFC 15/19] usb: gadget: amd5536udc: Replace PCI pool old API Date: Wed, 8 Feb 2017 19:43:02 +0100 Message-ID: <20170208184302.GO16878@collabora.com> References: <20170208163457.28853-1-romain.perier@collabora.com> <20170208163457.28853-16-romain.perier@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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 To: Romain Perier Return-path: Received: from bhuna.collabora.co.uk ([46.235.227.227]:34273 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751555AbdBHSoF (ORCPT ); Wed, 8 Feb 2017 13:44:05 -0500 Content-Disposition: inline In-Reply-To: <20170208163457.28853-16-romain.perier@collabora.com> Sender: netdev-owner@vger.kernel.org List-ID: On Wed, Feb 08, 2017 at 05:34:53PM +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. > Tested by compilation only. Acked-by: Peter Senna Tschudin Tested-by: Peter Senna Tschudin > Signed-off-by: Romain Perier > --- > drivers/usb/gadget/udc/amd5536udc.c | 8 ++++---- > drivers/usb/gadget/udc/amd5536udc.h | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/gadget/udc/amd5536udc.c b/drivers/usb/gadget/udc/amd5536udc.c > index ea03ca7..270876b 100644 > --- a/drivers/usb/gadget/udc/amd5536udc.c > +++ b/drivers/usb/gadget/udc/amd5536udc.c > @@ -583,7 +583,7 @@ udc_alloc_request(struct usb_ep *usbep, gfp_t gfp) > > if (ep->dma) { > /* ep0 in requests are allocated from data pool here */ > - dma_desc = pci_pool_alloc(ep->dev->data_requests, gfp, > + dma_desc = dma_pool_alloc(ep->dev->data_requests, gfp, > &req->td_phys); > if (!dma_desc) { > kfree(req); > @@ -622,7 +622,7 @@ static int udc_free_dma_chain(struct udc *dev, struct udc_request *req) > td = phys_to_virt(td_last->next); > > for (i = 1; i < req->chain_len; i++) { > - pci_pool_free(dev->data_requests, td, > + dma_pool_free(dev->data_requests, td, > (dma_addr_t)td_last->next); > td_last = td; > td = phys_to_virt(td_last->next); > @@ -652,7 +652,7 @@ udc_free_request(struct usb_ep *usbep, struct usb_request *usbreq) > if (req->chain_len > 1) > udc_free_dma_chain(ep->dev, req); > > - pci_pool_free(ep->dev->data_requests, req->td_data, > + dma_pool_free(ep->dev->data_requests, req->td_data, > req->td_phys); > } > kfree(req); > @@ -847,7 +847,7 @@ static int udc_create_dma_chain( > for (i = buf_len; i < bytes; i += buf_len) { > /* create or determine next desc. */ > if (create_new_chain) { > - td = pci_pool_alloc(ep->dev->data_requests, > + td = dma_pool_alloc(ep->dev->data_requests, > gfp_flags, &dma_addr); > if (!td) > return -ENOMEM; > diff --git a/drivers/usb/gadget/udc/amd5536udc.h b/drivers/usb/gadget/udc/amd5536udc.h > index 4638d70..85d5aa5 100644 > --- a/drivers/usb/gadget/udc/amd5536udc.h > +++ b/drivers/usb/gadget/udc/amd5536udc.h > @@ -545,8 +545,8 @@ struct udc { > u32 __iomem *txfifo; > > /* DMA desc pools */ > - struct pci_pool *data_requests; > - struct pci_pool *stp_requests; > + struct dma_pool *data_requests; > + struct dma_pool *stp_requests; > > /* device data */ > unsigned long phys_addr; > -- > 2.9.3 >