[PATCH V2 1/2] nvme-core: remove extra variable
Chaitanya Kulkarni
chaitanya.kulkarni at wdc.com
Thu Oct 1 14:54:31 EDT 2020
In nvme_validate_ns() the exra variable ctrl is used only twice.
Using ns->ctrl directly still maintains the redability and original
length of the lines in the code. Get rid of the extra variable ctrl &
use ns->ctrl directly.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>
---
drivers/nvme/host/core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 96dc87ea07b3..9a565096e072 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3931,20 +3931,19 @@ static void nvme_ns_remove_by_nsid(struct nvme_ctrl *ctrl, u32 nsid)
static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids)
{
- struct nvme_ctrl *ctrl = ns->ctrl;
struct nvme_id_ns *id;
int ret = -ENODEV;
if (test_bit(NVME_NS_DEAD, &ns->flags))
goto out;
- ret = nvme_identify_ns(ctrl, ns->head->ns_id, ids, &id);
+ ret = nvme_identify_ns(ns->ctrl, ns->head->ns_id, ids, &id);
if (ret)
goto out;
ret = -ENODEV;
if (!nvme_ns_ids_equal(&ns->head->ids, ids)) {
- dev_err(ctrl->device,
+ dev_err(ns->ctrl->device,
"identifiers changed for nsid %d\n", ns->head->ns_id);
goto out_free_id;
}
--
2.22.1
More information about the Linux-nvme
mailing list