nvme: Use nvme_state_terminal helper

Improve code readability.

Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index ad0847b6c769a0174bb0e6c38429b3eff81b48ee..392af3cf0bf9f213f71673ed9d7670c3ba554524 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2633,8 +2633,7 @@ static bool nvme_validate_cntlid(struct nvme_subsystem *subsys,
        lockdep_assert_held(&nvme_subsystems_lock);
 
        list_for_each_entry(tmp, &subsys->ctrls, subsys_entry) {
-               if (tmp->state == NVME_CTRL_DELETING ||
-                   tmp->state == NVME_CTRL_DEAD)
+               if (nvme_state_terminal(tmp))
                        continue;
 
                if (tmp->cntlid == ctrl->cntlid) {