From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v17,2/4] net: e100: Replace PCI pool old API From: Romain Perier Message-Id: <20180102175356.7999-3-romain.perier@gmail.com> Date: Tue, 2 Jan 2018 18:53:54 +0100 To: Jens Axboe , Andrew Morton , Dan Williams , Vinod Koul , Jeff Kirsher , Aviad Krawczyk , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org Cc: dmaengine@vger.kernel.org, "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Romain Perier List-ID: RnJvbTogUm9tYWluIFBlcmllciA8cm9tYWluLnBlcmllckBjb2xsYWJvcmEuY29tPgoKVGhlIFBD SSBwb29sIEFQSSBpcyBkZXByZWNhdGVkLiBUaGlzIGNvbW1pdCByZXBsYWNlcyB0aGUgUENJIHBv b2wgb2xkCkFQSSBieSB0aGUgYXBwcm9wcmlhdGUgZnVuY3Rpb24gd2l0aCB0aGUgRE1BIHBvb2wg QVBJLgoKU2lnbmVkLW9mZi1ieTogUm9tYWluIFBlcmllciA8cm9tYWluLnBlcmllckBjb2xsYWJv cmEuY29tPgpBY2tlZC1ieTogUGV0ZXIgU2VubmEgVHNjaHVkaW4gPHBldGVyLnNlbm5hQGNvbGxh Ym9yYS5jb20+CkFja2VkLWJ5OiBKZWZmIEtpcnNoZXIgPGplZmZyZXkudC5raXJzaGVyQGludGVs LmNvbT4KQWNrZWQtYnk6IERhdmlkIFMuIE1pbGxlciA8ZGF2ZW1AZGF2ZW1sb2Z0Lm5ldD4KVGVz dGVkLWJ5OiBQZXRlciBTZW5uYSBUc2NodWRpbiA8cGV0ZXIuc2VubmFAY29sbGFib3JhLmNvbT4K LS0tCiBkcml2ZXJzL25ldC9ldGhlcm5ldC9pbnRlbC9lMTAwLmMgfCAxMiArKysrKystLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9uZXQvZXRoZXJuZXQvaW50ZWwvZTEwMC5jIGIvZHJpdmVycy9uZXQvZXRo ZXJuZXQvaW50ZWwvZTEwMC5jCmluZGV4IDQ0YjM5MzdmN2U4MS4uMjk0ODY0Nzg4MzZlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL25ldC9ldGhlcm5ldC9pbnRlbC9lMTAwLmMKKysrIGIvZHJpdmVycy9u ZXQvZXRoZXJuZXQvaW50ZWwvZTEwMC5jCkBAIC02MDcsNyArNjA3LDcgQEAgc3RydWN0IG5pYyB7 CiAJc3RydWN0IG1lbSAqbWVtOwogCWRtYV9hZGRyX3QgZG1hX2FkZHI7CiAKLQlzdHJ1Y3QgcGNp X3Bvb2wgKmNic19wb29sOworCXN0cnVjdCBkbWFfcG9vbCAqY2JzX3Bvb2w7CiAJZG1hX2FkZHJf dCBjYnNfZG1hX2FkZHI7CiAJdTggYWRhcHRpdmVfaWZzOwogCXU4IHR4X3RocmVzaG9sZDsKQEAg LTE4OTIsNyArMTg5Miw3IEBAIHN0YXRpYyB2b2lkIGUxMDBfY2xlYW5fY2JzKHN0cnVjdCBuaWMg Km5pYykKIAkJCW5pYy0+Y2JfdG9fY2xlYW4gPSBuaWMtPmNiX3RvX2NsZWFuLT5uZXh0OwogCQkJ bmljLT5jYnNfYXZhaWwrKzsKIAkJfQotCQlwY2lfcG9vbF9mcmVlKG5pYy0+Y2JzX3Bvb2wsIG5p Yy0+Y2JzLCBuaWMtPmNic19kbWFfYWRkcik7CisJCWRtYV9wb29sX2ZyZWUobmljLT5jYnNfcG9v bCwgbmljLT5jYnMsIG5pYy0+Y2JzX2RtYV9hZGRyKTsKIAkJbmljLT5jYnMgPSBOVUxMOwogCQlu aWMtPmNic19hdmFpbCA9IDA7CiAJfQpAQCAtMTkxMCw3ICsxOTEwLDcgQEAgc3RhdGljIGludCBl MTAwX2FsbG9jX2NicyhzdHJ1Y3QgbmljICpuaWMpCiAJbmljLT5jYl90b191c2UgPSBuaWMtPmNi X3RvX3NlbmQgPSBuaWMtPmNiX3RvX2NsZWFuID0gTlVMTDsKIAluaWMtPmNic19hdmFpbCA9IDA7 CiAKLQluaWMtPmNicyA9IHBjaV9wb29sX3phbGxvYyhuaWMtPmNic19wb29sLCBHRlBfS0VSTkVM LAorCW5pYy0+Y2JzID0gZG1hX3Bvb2xfemFsbG9jKG5pYy0+Y2JzX3Bvb2wsIEdGUF9LRVJORUws CiAJCQkJICAgJm5pYy0+Y2JzX2RtYV9hZGRyKTsKIAlpZiAoIW5pYy0+Y2JzKQogCQlyZXR1cm4g LUVOT01FTTsKQEAgLTI5NjAsOCArMjk2MCw4IEBAIHN0YXRpYyBpbnQgZTEwMF9wcm9iZShzdHJ1 Y3QgcGNpX2RldiAqcGRldiwgY29uc3Qgc3RydWN0IHBjaV9kZXZpY2VfaWQgKmVudCkKIAkJbmV0 aWZfZXJyKG5pYywgcHJvYmUsIG5pYy0+bmV0ZGV2LCAiQ2Fubm90IHJlZ2lzdGVyIG5ldCBkZXZp Y2UsIGFib3J0aW5nXG4iKTsKIAkJZ290byBlcnJfb3V0X2ZyZWU7CiAJfQotCW5pYy0+Y2JzX3Bv b2wgPSBwY2lfcG9vbF9jcmVhdGUobmV0ZGV2LT5uYW1lLAotCQkJICAgbmljLT5wZGV2LAorCW5p Yy0+Y2JzX3Bvb2wgPSBkbWFfcG9vbF9jcmVhdGUobmV0ZGV2LT5uYW1lLAorCQkJICAgJm5pYy0+ cGRldi0+ZGV2LAogCQkJICAgbmljLT5wYXJhbXMuY2JzLm1heCAqIHNpemVvZihzdHJ1Y3QgY2Ip LAogCQkJICAgc2l6ZW9mKHUzMiksCiAJCQkgICAwKTsKQEAgLTMwMDEsNyArMzAwMSw3IEBAIHN0 YXRpYyB2b2lkIGUxMDBfcmVtb3ZlKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQogCQl1bnJlZ2lzdGVy X25ldGRldihuZXRkZXYpOwogCQllMTAwX2ZyZWUobmljKTsKIAkJcGNpX2lvdW5tYXAocGRldiwg bmljLT5jc3IpOwotCQlwY2lfcG9vbF9kZXN0cm95KG5pYy0+Y2JzX3Bvb2wpOworCQlkbWFfcG9v bF9kZXN0cm95KG5pYy0+Y2JzX3Bvb2wpOwogCQlmcmVlX25ldGRldihuZXRkZXYpOwogCQlwY2lf cmVsZWFzZV9yZWdpb25zKHBkZXYpOwogCQlwY2lfZGlzYWJsZV9kZXZpY2UocGRldik7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com ([209.85.128.194]:45802 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751283AbeABRyN (ORCPT ); Tue, 2 Jan 2018 12:54:13 -0500 From: Romain Perier To: Jens Axboe , Andrew Morton , Dan Williams , Vinod Koul , Jeff Kirsher , Aviad Krawczyk , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, Bjorn Helgaas , linux-pci@vger.kernel.org Cc: dmaengine@vger.kernel.org, "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Romain Perier Subject: [PATCH v17 2/4] net: e100: Replace PCI pool old API Date: Tue, 2 Jan 2018 18:53:54 +0100 Message-Id: <20180102175356.7999-3-romain.perier@gmail.com> In-Reply-To: <20180102175356.7999-1-romain.perier@gmail.com> References: <20180102175356.7999-1-romain.perier@gmail.com> Sender: linux-pci-owner@vger.kernel.org List-ID: From: Romain Perier 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 Acked-by: Peter Senna Tschudin Acked-by: Jeff Kirsher Acked-by: David S. Miller Tested-by: Peter Senna Tschudin --- 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 44b3937f7e81..29486478836e 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_zalloc(nic->cbs_pool, GFP_KERNEL, + nic->cbs = dma_pool_zalloc(nic->cbs_pool, GFP_KERNEL, &nic->cbs_dma_addr); if (!nic->cbs) return -ENOMEM; @@ -2960,8 +2960,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); @@ -3001,7 +3001,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.14.1