From 439e85c1e89bd1ed8c99f8b46f87f495a675d95e Mon Sep 17 00:00:00 2001 From: "Matthew R. Ochs" Date: Wed, 21 Oct 2015 15:12:00 -0500 Subject: cxlflash: Correct naming of limbo state and waitq Limbo is not an accurate representation of this state and is also not consistent with the terminology that other drivers use to represent this concept. Rename the state and and its associated waitq to 'reset'. Signed-off-by: Matthew R. Ochs Signed-off-by: Manoj N. Kumar Reviewed-by: Brian King Reviewed-by: Daniel Axtens Reviewed-by: Tomas Henzl Signed-off-by: James Bottomley --- drivers/scsi/cxlflash/superpipe.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'drivers/scsi/cxlflash/superpipe.c') diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c index 6e8fc1125e53..577aa25d80f5 100644 --- a/drivers/scsi/cxlflash/superpipe.c +++ b/drivers/scsi/cxlflash/superpipe.c @@ -100,7 +100,7 @@ void cxlflash_stop_term_user_contexts(struct cxlflash_cfg *cfg) dev_dbg(dev, "%s: Wait for user contexts to quiesce...\n", __func__); - wake_up_all(&cfg->limbo_waitq); + wake_up_all(&cfg->reset_waitq); ssleep(1); } } @@ -1233,11 +1233,11 @@ static int check_state(struct cxlflash_cfg *cfg) retry: switch (cfg->state) { - case STATE_LIMBO: - dev_dbg(dev, "%s: Limbo state, going to wait...\n", __func__); + case STATE_RESET: + dev_dbg(dev, "%s: Reset state, going to wait...\n", __func__); up_read(&cfg->ioctl_rwsem); - rc = wait_event_interruptible(cfg->limbo_waitq, - cfg->state != STATE_LIMBO); + rc = wait_event_interruptible(cfg->reset_waitq, + cfg->state != STATE_RESET); down_read(&cfg->ioctl_rwsem); if (unlikely(rc)) break; @@ -1578,10 +1578,10 @@ err1: * quite possible for this routine to act as the kernel's EEH detection * source (MMIO read of mbox_r). Because of this, there is a window of * time where an EEH might have been detected but not yet 'serviced' - * (callback invoked, causing the device to enter limbo state). To avoid + * (callback invoked, causing the device to enter reset state). To avoid * looping in this routine during that window, a 1 second sleep is in place * between the time the MMIO failure is detected and the time a wait on the - * limbo wait queue is attempted via check_state(). + * reset wait queue is attempted via check_state(). * * Return: 0 on success, -errno on failure */ -- cgit