Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: gadget: amd5536udc: Replace PCI pool old API

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Romain Perier and committed by
Greg Kroah-Hartman
b5a6a4e5 d293408e

+6 -6
+4 -4
drivers/usb/gadget/udc/amd5536udc.c
··· 583 583 584 584 if (ep->dma) { 585 585 /* ep0 in requests are allocated from data pool here */ 586 - dma_desc = pci_pool_alloc(ep->dev->data_requests, gfp, 586 + dma_desc = dma_pool_alloc(ep->dev->data_requests, gfp, 587 587 &req->td_phys); 588 588 if (!dma_desc) { 589 589 kfree(req); ··· 622 622 td = phys_to_virt(td_last->next); 623 623 624 624 for (i = 1; i < req->chain_len; i++) { 625 - pci_pool_free(dev->data_requests, td, 625 + dma_pool_free(dev->data_requests, td, 626 626 (dma_addr_t)td_last->next); 627 627 td_last = td; 628 628 td = phys_to_virt(td_last->next); ··· 652 652 if (req->chain_len > 1) 653 653 udc_free_dma_chain(ep->dev, req); 654 654 655 - pci_pool_free(ep->dev->data_requests, req->td_data, 655 + dma_pool_free(ep->dev->data_requests, req->td_data, 656 656 req->td_phys); 657 657 } 658 658 kfree(req); ··· 847 847 for (i = buf_len; i < bytes; i += buf_len) { 848 848 /* create or determine next desc. */ 849 849 if (create_new_chain) { 850 - td = pci_pool_alloc(ep->dev->data_requests, 850 + td = dma_pool_alloc(ep->dev->data_requests, 851 851 gfp_flags, &dma_addr); 852 852 if (!td) 853 853 return -ENOMEM;
+2 -2
drivers/usb/gadget/udc/amd5536udc.h
··· 545 545 u32 __iomem *txfifo; 546 546 547 547 /* DMA desc pools */ 548 - struct pci_pool *data_requests; 549 - struct pci_pool *stp_requests; 548 + struct dma_pool *data_requests; 549 + struct dma_pool *stp_requests; 550 550 551 551 /* device data */ 552 552 unsigned long phys_addr;