From: Matthew Wilcox (Oracle) <willy@infradead.org>
Date: Sun, 27 Sep 2020 20:40:44 +0000 (-0400)
Subject: scsi: qedi: Use kmalloc instead of __get_free_pages
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fgfp-removal;p=users%2Fwilly%2Flinux.git

scsi: qedi: Use kmalloc instead of __get_free_pages

There's no need to use this low-level allocator in this driver.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---

diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index 6f038ae5efca..25a0f05c745c 100644
--- a/drivers/scsi/qedi/qedi_main.c
+++ b/drivers/scsi/qedi/qedi_main.c
@@ -170,10 +170,8 @@ static void __qedi_free_uio_rings(struct qedi_uio_dev *udev)
 		udev->ll2_ring = NULL;
 	}
 
-	if (udev->ll2_buf) {
-		free_pages((unsigned long)udev->ll2_buf, 2);
-		udev->ll2_buf = NULL;
-	}
+	kfree(udev->ll2_buf);
+	udev->ll2_buf = NULL;
 }
 
 static void __qedi_free_uio(struct qedi_uio_dev *udev)
@@ -237,8 +235,7 @@ static int __qedi_alloc_uio_rings(struct qedi_uio_dev *udev)
 	/* Allocating memory for Tx/Rx pkt buffer */
 	udev->ll2_buf_size = TX_RX_RING * qedi_ll2_buf_size;
 	udev->ll2_buf_size = QEDI_PAGE_ALIGN(udev->ll2_buf_size);
-	udev->ll2_buf = (void *)__get_free_pages(GFP_KERNEL | __GFP_COMP |
-						 __GFP_ZERO, 2);
+	udev->ll2_buf = kzalloc(PAGE_SIZE * 4, GFP_KERNEL);
 	if (!udev->ll2_buf) {
 		rc = -ENOMEM;
 		goto exit_alloc_buf;