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,1/4] block: DAC960: Replace PCI pool old API From: Romain Perier Message-Id: <20180102175356.7999-2-romain.perier@gmail.com> Date: Tue, 2 Jan 2018 18:53:53 +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+ClRlc3RlZC1ieTogUGV0ZXIgU2VubmEgVHNjaHVkaW4gPHBldGVyLnNlbm5hQGNv bGxhYm9yYS5jb20+Ci0tLQogZHJpdmVycy9ibG9jay9EQUM5NjAuYyB8IDM4ICsrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2Jsb2NrL0RBQzk2MC5oIHwgIDQg KystLQogMiBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2Jsb2NrL0RBQzk2MC5jIGIvZHJpdmVycy9ibG9jay9EQUM5 NjAuYwppbmRleCA0NDJlNzc3YmRmYjIuLmRmOGUzYThmNjNlYyAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ibG9jay9EQUM5NjAuYworKysgYi9kcml2ZXJzL2Jsb2NrL0RBQzk2MC5jCkBAIC0yNjgsMTcg KzI2OCwxNyBAQCBzdGF0aWMgYm9vbCBEQUM5NjBfQ3JlYXRlQXV4aWxpYXJ5U3RydWN0dXJlcyhE QUM5NjBfQ29udHJvbGxlcl9UICpDb250cm9sbGVyKQogICB2b2lkICpBbGxvY2F0aW9uUG9pbnRl ciA9IE5VTEw7CiAgIHZvaWQgKlNjYXR0ZXJHYXRoZXJDUFUgPSBOVUxMOwogICBkbWFfYWRkcl90 IFNjYXR0ZXJHYXRoZXJETUE7Ci0gIHN0cnVjdCBwY2lfcG9vbCAqU2NhdHRlckdhdGhlclBvb2w7 CisgIHN0cnVjdCBkbWFfcG9vbCAqU2NhdHRlckdhdGhlclBvb2w7CiAgIHZvaWQgKlJlcXVlc3RT ZW5zZUNQVSA9IE5VTEw7CiAgIGRtYV9hZGRyX3QgUmVxdWVzdFNlbnNlRE1BOwotICBzdHJ1Y3Qg cGNpX3Bvb2wgKlJlcXVlc3RTZW5zZVBvb2wgPSBOVUxMOworICBzdHJ1Y3QgZG1hX3Bvb2wgKlJl cXVlc3RTZW5zZVBvb2wgPSBOVUxMOwogCiAgIGlmIChDb250cm9sbGVyLT5GaXJtd2FyZVR5cGUg PT0gREFDOTYwX1YxX0NvbnRyb2xsZXIpCiAgICAgewogICAgICAgQ29tbWFuZEFsbG9jYXRpb25M ZW5ndGggPSBvZmZzZXRvZihEQUM5NjBfQ29tbWFuZF9ULCBWMS5FbmRNYXJrZXIpOwogICAgICAg Q29tbWFuZEFsbG9jYXRpb25Hcm91cFNpemUgPSBEQUM5NjBfVjFfQ29tbWFuZEFsbG9jYXRpb25H cm91cFNpemU7Ci0gICAgICBTY2F0dGVyR2F0aGVyUG9vbCA9IHBjaV9wb29sX2NyZWF0ZSgiREFD OTYwX1YxX1NjYXR0ZXJHYXRoZXIiLAotCQlDb250cm9sbGVyLT5QQ0lEZXZpY2UsCisgICAgICBT Y2F0dGVyR2F0aGVyUG9vbCA9IGRtYV9wb29sX2NyZWF0ZSgiREFDOTYwX1YxX1NjYXR0ZXJHYXRo ZXIiLAorCQkmQ29udHJvbGxlci0+UENJRGV2aWNlLT5kZXYsCiAJREFDOTYwX1YxX1NjYXR0ZXJH YXRoZXJMaW1pdCAqIHNpemVvZihEQUM5NjBfVjFfU2NhdHRlckdhdGhlclNlZ21lbnRfVCksCiAJ c2l6ZW9mKERBQzk2MF9WMV9TY2F0dGVyR2F0aGVyU2VnbWVudF9UKSwgMCk7CiAgICAgICBpZiAo U2NhdHRlckdhdGhlclBvb2wgPT0gTlVMTCkKQEAgLTI5MCwxOCArMjkwLDE4IEBAIHN0YXRpYyBi b29sIERBQzk2MF9DcmVhdGVBdXhpbGlhcnlTdHJ1Y3R1cmVzKERBQzk2MF9Db250cm9sbGVyX1Qg KkNvbnRyb2xsZXIpCiAgICAgewogICAgICAgQ29tbWFuZEFsbG9jYXRpb25MZW5ndGggPSBvZmZz ZXRvZihEQUM5NjBfQ29tbWFuZF9ULCBWMi5FbmRNYXJrZXIpOwogICAgICAgQ29tbWFuZEFsbG9j YXRpb25Hcm91cFNpemUgPSBEQUM5NjBfVjJfQ29tbWFuZEFsbG9jYXRpb25Hcm91cFNpemU7Ci0g ICAgICBTY2F0dGVyR2F0aGVyUG9vbCA9IHBjaV9wb29sX2NyZWF0ZSgiREFDOTYwX1YyX1NjYXR0 ZXJHYXRoZXIiLAotCQlDb250cm9sbGVyLT5QQ0lEZXZpY2UsCisgICAgICBTY2F0dGVyR2F0aGVy UG9vbCA9IGRtYV9wb29sX2NyZWF0ZSgiREFDOTYwX1YyX1NjYXR0ZXJHYXRoZXIiLAorCQkmQ29u dHJvbGxlci0+UENJRGV2aWNlLT5kZXYsCiAJREFDOTYwX1YyX1NjYXR0ZXJHYXRoZXJMaW1pdCAq IHNpemVvZihEQUM5NjBfVjJfU2NhdHRlckdhdGhlclNlZ21lbnRfVCksCiAJc2l6ZW9mKERBQzk2 MF9WMl9TY2F0dGVyR2F0aGVyU2VnbWVudF9UKSwgMCk7CiAgICAgICBpZiAoU2NhdHRlckdhdGhl clBvb2wgPT0gTlVMTCkKIAkgICAgcmV0dXJuIERBQzk2MF9GYWlsdXJlKENvbnRyb2xsZXIsCiAJ CQkiQVVYSUxJQVJZIFNUUlVDVFVSRSBDUkVBVElPTiAoU0cpIik7Ci0gICAgICBSZXF1ZXN0U2Vu c2VQb29sID0gcGNpX3Bvb2xfY3JlYXRlKCJEQUM5NjBfVjJfUmVxdWVzdFNlbnNlIiwKLQkJQ29u dHJvbGxlci0+UENJRGV2aWNlLCBzaXplb2YoREFDOTYwX1NDU0lfUmVxdWVzdFNlbnNlX1QpLAor ICAgICAgUmVxdWVzdFNlbnNlUG9vbCA9IGRtYV9wb29sX2NyZWF0ZSgiREFDOTYwX1YyX1JlcXVl c3RTZW5zZSIsCisJCSZDb250cm9sbGVyLT5QQ0lEZXZpY2UtPmRldiwgc2l6ZW9mKERBQzk2MF9T Q1NJX1JlcXVlc3RTZW5zZV9UKSwKIAkJc2l6ZW9mKGludCksIDApOwogICAgICAgaWYgKFJlcXVl c3RTZW5zZVBvb2wgPT0gTlVMTCkgewotCSAgICBwY2lfcG9vbF9kZXN0cm95KFNjYXR0ZXJHYXRo ZXJQb29sKTsKKwkgICAgZG1hX3Bvb2xfZGVzdHJveShTY2F0dGVyR2F0aGVyUG9vbCk7CiAJICAg IHJldHVybiBEQUM5NjBfRmFpbHVyZShDb250cm9sbGVyLAogCQkJIkFVWElMSUFSWSBTVFJVQ1RV UkUgQ1JFQVRJT04gKFNHKSIpOwogICAgICAgfQpAQCAtMzM1LDE2ICszMzUsMTYgQEAgc3RhdGlj IGJvb2wgREFDOTYwX0NyZWF0ZUF1eGlsaWFyeVN0cnVjdHVyZXMoREFDOTYwX0NvbnRyb2xsZXJf VCAqQ29udHJvbGxlcikKICAgICAgIENvbW1hbmQtPk5leHQgPSBDb250cm9sbGVyLT5GcmVlQ29t bWFuZHM7CiAgICAgICBDb250cm9sbGVyLT5GcmVlQ29tbWFuZHMgPSBDb21tYW5kOwogICAgICAg Q29udHJvbGxlci0+Q29tbWFuZHNbQ29tbWFuZElkZW50aWZpZXItMV0gPSBDb21tYW5kOwotICAg ICAgU2NhdHRlckdhdGhlckNQVSA9IHBjaV9wb29sX2FsbG9jKFNjYXR0ZXJHYXRoZXJQb29sLCBH RlBfQVRPTUlDLAorICAgICAgU2NhdHRlckdhdGhlckNQVSA9IGRtYV9wb29sX2FsbG9jKFNjYXR0 ZXJHYXRoZXJQb29sLCBHRlBfQVRPTUlDLAogCQkJCQkJCSZTY2F0dGVyR2F0aGVyRE1BKTsKICAg ICAgIGlmIChTY2F0dGVyR2F0aGVyQ1BVID09IE5VTEwpCiAJICByZXR1cm4gREFDOTYwX0ZhaWx1 cmUoQ29udHJvbGxlciwgIkFVWElMSUFSWSBTVFJVQ1RVUkUgQ1JFQVRJT04iKTsKIAogICAgICAg aWYgKFJlcXVlc3RTZW5zZVBvb2wgIT0gTlVMTCkgewotICAJICBSZXF1ZXN0U2Vuc2VDUFUgPSBw Y2lfcG9vbF9hbGxvYyhSZXF1ZXN0U2Vuc2VQb29sLCBHRlBfQVRPTUlDLAorICAJICBSZXF1ZXN0 U2Vuc2VDUFUgPSBkbWFfcG9vbF9hbGxvYyhSZXF1ZXN0U2Vuc2VQb29sLCBHRlBfQVRPTUlDLAog CQkJCQkJJlJlcXVlc3RTZW5zZURNQSk7CiAgIAkgIGlmIChSZXF1ZXN0U2Vuc2VDUFUgPT0gTlVM TCkgewotICAgICAgICAgICAgICAgIHBjaV9wb29sX2ZyZWUoU2NhdHRlckdhdGhlclBvb2wsIFNj YXR0ZXJHYXRoZXJDUFUsCisgICAgICAgICAgICAgICAgZG1hX3Bvb2xfZnJlZShTY2F0dGVyR2F0 aGVyUG9vbCwgU2NhdHRlckdhdGhlckNQVSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgU2NhdHRlckdhdGhlckRNQSk7CiAgICAgCQlyZXR1cm4gREFDOTYwX0ZhaWx1cmUoQ29udHJv bGxlciwKIAkJCQkJIkFVWElMSUFSWSBTVFJVQ1RVUkUgQ1JFQVRJT04iKTsKQEAgLTM3OSw4ICsz NzksOCBAQCBzdGF0aWMgYm9vbCBEQUM5NjBfQ3JlYXRlQXV4aWxpYXJ5U3RydWN0dXJlcyhEQUM5 NjBfQ29udHJvbGxlcl9UICpDb250cm9sbGVyKQogc3RhdGljIHZvaWQgREFDOTYwX0Rlc3Ryb3lB dXhpbGlhcnlTdHJ1Y3R1cmVzKERBQzk2MF9Db250cm9sbGVyX1QgKkNvbnRyb2xsZXIpCiB7CiAg IGludCBpOwotICBzdHJ1Y3QgcGNpX3Bvb2wgKlNjYXR0ZXJHYXRoZXJQb29sID0gQ29udHJvbGxl ci0+U2NhdHRlckdhdGhlclBvb2w7Ci0gIHN0cnVjdCBwY2lfcG9vbCAqUmVxdWVzdFNlbnNlUG9v bCA9IE5VTEw7CisgIHN0cnVjdCBkbWFfcG9vbCAqU2NhdHRlckdhdGhlclBvb2wgPSBDb250cm9s bGVyLT5TY2F0dGVyR2F0aGVyUG9vbDsKKyAgc3RydWN0IGRtYV9wb29sICpSZXF1ZXN0U2Vuc2VQ b29sID0gTlVMTDsKICAgdm9pZCAqU2NhdHRlckdhdGhlckNQVTsKICAgZG1hX2FkZHJfdCBTY2F0 dGVyR2F0aGVyRE1BOwogICB2b2lkICpSZXF1ZXN0U2Vuc2VDUFU7CkBAIC00MTEsOSArNDExLDkg QEAgc3RhdGljIHZvaWQgREFDOTYwX0Rlc3Ryb3lBdXhpbGlhcnlTdHJ1Y3R1cmVzKERBQzk2MF9D b250cm9sbGVyX1QgKkNvbnRyb2xsZXIpCiAJICBSZXF1ZXN0U2Vuc2VETUEgPSBDb21tYW5kLT5W Mi5SZXF1ZXN0U2Vuc2VETUE7CiAgICAgICB9CiAgICAgICBpZiAoU2NhdHRlckdhdGhlckNQVSAh PSBOVUxMKQotICAgICAgICAgIHBjaV9wb29sX2ZyZWUoU2NhdHRlckdhdGhlclBvb2wsIFNjYXR0 ZXJHYXRoZXJDUFUsIFNjYXR0ZXJHYXRoZXJETUEpOworICAgICAgICAgIGRtYV9wb29sX2ZyZWUo U2NhdHRlckdhdGhlclBvb2wsIFNjYXR0ZXJHYXRoZXJDUFUsIFNjYXR0ZXJHYXRoZXJETUEpOwog ICAgICAgaWYgKFJlcXVlc3RTZW5zZUNQVSAhPSBOVUxMKQotICAgICAgICAgIHBjaV9wb29sX2Zy ZWUoUmVxdWVzdFNlbnNlUG9vbCwgUmVxdWVzdFNlbnNlQ1BVLCBSZXF1ZXN0U2Vuc2VETUEpOwor ICAgICAgICAgIGRtYV9wb29sX2ZyZWUoUmVxdWVzdFNlbnNlUG9vbCwgUmVxdWVzdFNlbnNlQ1BV LCBSZXF1ZXN0U2Vuc2VETUEpOwogCiAgICAgICBpZiAoKENvbW1hbmQtPkNvbW1hbmRJZGVudGlm aWVyCiAJICAgJSBDb250cm9sbGVyLT5Db21tYW5kQWxsb2NhdGlvbkdyb3VwU2l6ZSkgPT0gMSkg ewpAQCAtNDM3LDEzICs0MzcsMTEgQEAgc3RhdGljIHZvaWQgREFDOTYwX0Rlc3Ryb3lBdXhpbGlh cnlTdHJ1Y3R1cmVzKERBQzk2MF9Db250cm9sbGVyX1QgKkNvbnRyb2xsZXIpCiAgICAgICBDb250 cm9sbGVyLT5DdXJyZW50U3RhdHVzQnVmZmVyID0gTlVMTDsKICAgICB9CiAKLSAgaWYgKFNjYXR0 ZXJHYXRoZXJQb29sICE9IE5VTEwpCi0gIAlwY2lfcG9vbF9kZXN0cm95KFNjYXR0ZXJHYXRoZXJQ b29sKTsKKyAgZG1hX3Bvb2xfZGVzdHJveShTY2F0dGVyR2F0aGVyUG9vbCk7CiAgIGlmIChDb250 cm9sbGVyLT5GaXJtd2FyZVR5cGUgPT0gREFDOTYwX1YxX0NvbnRyb2xsZXIpCiAgIAlyZXR1cm47 CiAKLSAgaWYgKFJlcXVlc3RTZW5zZVBvb2wgIT0gTlVMTCkKLQlwY2lfcG9vbF9kZXN0cm95KFJl cXVlc3RTZW5zZVBvb2wpOworICBkbWFfcG9vbF9kZXN0cm95KFJlcXVlc3RTZW5zZVBvb2wpOwog CiAgIGZvciAoaSA9IDA7IGkgPCBEQUM5NjBfTWF4TG9naWNhbERyaXZlczsgaSsrKSB7CiAJa2Zy ZWUoQ29udHJvbGxlci0+VjIuTG9naWNhbERldmljZUluZm9ybWF0aW9uW2ldKTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvYmxvY2svREFDOTYwLmggYi9kcml2ZXJzL2Jsb2NrL0RBQzk2MC5oCmluZGV4 IDZhNjIyNmEyYjkzMi4uMjFhZmY0NzBkMjY4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2Jsb2NrL0RB Qzk2MC5oCisrKyBiL2RyaXZlcnMvYmxvY2svREFDOTYwLmgKQEAgLTIzMTYsNyArMjMxNiw3IEBA IHR5cGVkZWYgc3RydWN0IERBQzk2MF9Db250cm9sbGVyCiAgIGJvb2wgU3VwcHJlc3NFbmNsb3N1 cmVNZXNzYWdlczsKICAgc3RydWN0IHRpbWVyX2xpc3QgTW9uaXRvcmluZ1RpbWVyOwogICBzdHJ1 Y3QgZ2VuZGlzayAqZGlza3NbREFDOTYwX01heExvZ2ljYWxEcml2ZXNdOwotICBzdHJ1Y3QgcGNp X3Bvb2wgKlNjYXR0ZXJHYXRoZXJQb29sOworICBzdHJ1Y3QgZG1hX3Bvb2wgKlNjYXR0ZXJHYXRo ZXJQb29sOwogICBEQUM5NjBfQ29tbWFuZF9UICpGcmVlQ29tbWFuZHM7CiAgIHVuc2lnbmVkIGNo YXIgKkNvbWJpbmVkU3RhdHVzQnVmZmVyOwogICB1bnNpZ25lZCBjaGFyICpDdXJyZW50U3RhdHVz QnVmZmVyOwpAQCAtMjQyOSw3ICsyNDI5LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgREFDOTYwX0NvbnRy b2xsZXIKICAgICAgIGJvb2wgTmVlZERldmljZVNlcmlhbE51bWJlckluZm9ybWF0aW9uOwogICAg ICAgYm9vbCBTdGFydExvZ2ljYWxEZXZpY2VJbmZvcm1hdGlvblNjYW47CiAgICAgICBib29sIFN0 YXJ0UGh5c2ljYWxEZXZpY2VJbmZvcm1hdGlvblNjYW47Ci0gICAgICBzdHJ1Y3QgcGNpX3Bvb2wg KlJlcXVlc3RTZW5zZVBvb2w7CisgICAgICBzdHJ1Y3QgZG1hX3Bvb2wgKlJlcXVlc3RTZW5zZVBv b2w7CiAKICAgICAgIGRtYV9hZGRyX3QJRmlyc3RDb21tYW5kTWFpbGJveERNQTsKICAgICAgIERB Qzk2MF9WMl9Db21tYW5kTWFpbGJveF9UICpGaXJzdENvbW1hbmRNYWlsYm94Owo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com ([209.85.128.194]:34594 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751238AbeABRyM (ORCPT ); Tue, 2 Jan 2018 12:54:12 -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 1/4] block: DAC960: Replace PCI pool old API Date: Tue, 2 Jan 2018 18:53:53 +0100 Message-Id: <20180102175356.7999-2-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 Tested-by: Peter Senna Tschudin --- drivers/block/DAC960.c | 38 ++++++++++++++++++-------------------- drivers/block/DAC960.h | 4 ++-- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 442e777bdfb2..df8e3a8f63ec 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c @@ -268,17 +268,17 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) void *AllocationPointer = NULL; void *ScatterGatherCPU = NULL; dma_addr_t ScatterGatherDMA; - struct pci_pool *ScatterGatherPool; + struct dma_pool *ScatterGatherPool; void *RequestSenseCPU = NULL; dma_addr_t RequestSenseDMA; - struct pci_pool *RequestSensePool = NULL; + struct dma_pool *RequestSensePool = NULL; if (Controller->FirmwareType == DAC960_V1_Controller) { CommandAllocationLength = offsetof(DAC960_Command_T, V1.EndMarker); CommandAllocationGroupSize = DAC960_V1_CommandAllocationGroupSize; - ScatterGatherPool = pci_pool_create("DAC960_V1_ScatterGather", - Controller->PCIDevice, + ScatterGatherPool = dma_pool_create("DAC960_V1_ScatterGather", + &Controller->PCIDevice->dev, DAC960_V1_ScatterGatherLimit * sizeof(DAC960_V1_ScatterGatherSegment_T), sizeof(DAC960_V1_ScatterGatherSegment_T), 0); if (ScatterGatherPool == NULL) @@ -290,18 +290,18 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) { CommandAllocationLength = offsetof(DAC960_Command_T, V2.EndMarker); CommandAllocationGroupSize = DAC960_V2_CommandAllocationGroupSize; - ScatterGatherPool = pci_pool_create("DAC960_V2_ScatterGather", - Controller->PCIDevice, + ScatterGatherPool = dma_pool_create("DAC960_V2_ScatterGather", + &Controller->PCIDevice->dev, DAC960_V2_ScatterGatherLimit * sizeof(DAC960_V2_ScatterGatherSegment_T), sizeof(DAC960_V2_ScatterGatherSegment_T), 0); if (ScatterGatherPool == NULL) return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION (SG)"); - RequestSensePool = pci_pool_create("DAC960_V2_RequestSense", - Controller->PCIDevice, sizeof(DAC960_SCSI_RequestSense_T), + RequestSensePool = dma_pool_create("DAC960_V2_RequestSense", + &Controller->PCIDevice->dev, sizeof(DAC960_SCSI_RequestSense_T), sizeof(int), 0); if (RequestSensePool == NULL) { - pci_pool_destroy(ScatterGatherPool); + dma_pool_destroy(ScatterGatherPool); return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION (SG)"); } @@ -335,16 +335,16 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) Command->Next = Controller->FreeCommands; Controller->FreeCommands = Command; Controller->Commands[CommandIdentifier-1] = Command; - ScatterGatherCPU = pci_pool_alloc(ScatterGatherPool, GFP_ATOMIC, + ScatterGatherCPU = dma_pool_alloc(ScatterGatherPool, GFP_ATOMIC, &ScatterGatherDMA); if (ScatterGatherCPU == NULL) return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION"); if (RequestSensePool != NULL) { - RequestSenseCPU = pci_pool_alloc(RequestSensePool, GFP_ATOMIC, + RequestSenseCPU = dma_pool_alloc(RequestSensePool, GFP_ATOMIC, &RequestSenseDMA); if (RequestSenseCPU == NULL) { - pci_pool_free(ScatterGatherPool, ScatterGatherCPU, + dma_pool_free(ScatterGatherPool, ScatterGatherCPU, ScatterGatherDMA); return DAC960_Failure(Controller, "AUXILIARY STRUCTURE CREATION"); @@ -379,8 +379,8 @@ static bool DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller) { int i; - struct pci_pool *ScatterGatherPool = Controller->ScatterGatherPool; - struct pci_pool *RequestSensePool = NULL; + struct dma_pool *ScatterGatherPool = Controller->ScatterGatherPool; + struct dma_pool *RequestSensePool = NULL; void *ScatterGatherCPU; dma_addr_t ScatterGatherDMA; void *RequestSenseCPU; @@ -411,9 +411,9 @@ static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller) RequestSenseDMA = Command->V2.RequestSenseDMA; } if (ScatterGatherCPU != NULL) - pci_pool_free(ScatterGatherPool, ScatterGatherCPU, ScatterGatherDMA); + dma_pool_free(ScatterGatherPool, ScatterGatherCPU, ScatterGatherDMA); if (RequestSenseCPU != NULL) - pci_pool_free(RequestSensePool, RequestSenseCPU, RequestSenseDMA); + dma_pool_free(RequestSensePool, RequestSenseCPU, RequestSenseDMA); if ((Command->CommandIdentifier % Controller->CommandAllocationGroupSize) == 1) { @@ -437,13 +437,11 @@ static void DAC960_DestroyAuxiliaryStructures(DAC960_Controller_T *Controller) Controller->CurrentStatusBuffer = NULL; } - if (ScatterGatherPool != NULL) - pci_pool_destroy(ScatterGatherPool); + dma_pool_destroy(ScatterGatherPool); if (Controller->FirmwareType == DAC960_V1_Controller) return; - if (RequestSensePool != NULL) - pci_pool_destroy(RequestSensePool); + dma_pool_destroy(RequestSensePool); for (i = 0; i < DAC960_MaxLogicalDrives; i++) { kfree(Controller->V2.LogicalDeviceInformation[i]); diff --git a/drivers/block/DAC960.h b/drivers/block/DAC960.h index 6a6226a2b932..21aff470d268 100644 --- a/drivers/block/DAC960.h +++ b/drivers/block/DAC960.h @@ -2316,7 +2316,7 @@ typedef struct DAC960_Controller bool SuppressEnclosureMessages; struct timer_list MonitoringTimer; struct gendisk *disks[DAC960_MaxLogicalDrives]; - struct pci_pool *ScatterGatherPool; + struct dma_pool *ScatterGatherPool; DAC960_Command_T *FreeCommands; unsigned char *CombinedStatusBuffer; unsigned char *CurrentStatusBuffer; @@ -2429,7 +2429,7 @@ typedef struct DAC960_Controller bool NeedDeviceSerialNumberInformation; bool StartLogicalDeviceInformationScan; bool StartPhysicalDeviceInformationScan; - struct pci_pool *RequestSensePool; + struct dma_pool *RequestSensePool; dma_addr_t FirstCommandMailboxDMA; DAC960_V2_CommandMailbox_T *FirstCommandMailbox; -- 2.14.1