50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From ab2790f8ff78790ea8a9cb0b05cafc55648ebbc4 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <ab2790f8ff78790ea8a9cb0b05cafc55648ebbc4.1668448794.git.stefan@agner.ch>
|
|
In-Reply-To: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
|
|
References: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
|
|
From: Stefan Agner <stefan@agner.ch>
|
|
Date: Thu, 23 Sep 2021 23:52:44 +0200
|
|
Subject: [PATCH] nvme: improve readability of nvme_setup_prps()
|
|
|
|
Improve readability by introducing consts, reuse consts where
|
|
appropriate and adding variables with discriptive name.
|
|
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
drivers/nvme/nvme.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c
|
|
index 73db80a294..751abc3cd5 100644
|
|
--- a/drivers/nvme/nvme.c
|
|
+++ b/drivers/nvme/nvme.c
|
|
@@ -47,12 +47,12 @@ static int nvme_wait_csts(struct nvme_dev *dev, u32 mask, u32 val)
|
|
static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
|
|
int total_len, u64 dma_addr)
|
|
{
|
|
- u32 page_size = dev->page_size;
|
|
+ const u32 page_size = dev->page_size;
|
|
+ const u32 prps_per_page = (page_size >> 3) - 1;
|
|
int offset = dma_addr & (page_size - 1);
|
|
u64 *prp_pool;
|
|
int length = total_len;
|
|
int i, nprps;
|
|
- u32 prps_per_page = (page_size >> 3) - 1;
|
|
u32 num_pages;
|
|
|
|
length -= (page_size - offset);
|
|
@@ -91,8 +91,8 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2,
|
|
i = 0;
|
|
while (nprps) {
|
|
if ((i == (prps_per_page - 1)) && nprps > 1) {
|
|
- *(prp_pool + i) = cpu_to_le64((ulong)prp_pool +
|
|
- page_size);
|
|
+ u64 next_prp_list = (u64)prp_pool + page_size;
|
|
+ *(prp_pool + i) = cpu_to_le64(next_prp_list);
|
|
i = 0;
|
|
prp_pool += page_size;
|
|
}
|
|
--
|
|
2.38.1
|
|
|