From: Andrew Morton <akpm@linux-foundation.org>
To: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Cc: James.Bottomley@HansenPartnership.com,
linux-kernel@vger.kernel.org, mikem@beardog.cce.hp.com,
linux-scsi@vger.kernel.org, smcameron@yahoo.com
Subject: Re: [PATCH 1/5] Use msleep() instead of schedule_timeout
Date: Tue, 8 Dec 2009 14:02:45 -0800 [thread overview]
Message-ID: <20091208140245.e654805c.akpm@linux-foundation.org> (raw)
In-Reply-To: <20091208213812.23493.20587.stgit@beardog.cce.hp.com>
On Tue, 08 Dec 2009 15:38:12 -0600
"Stephen M. Cameron" <scameron@beardog.cce.hp.com> wrote:
> Use msleep() instead of schedule_timeout
msleep() does set_current_state() itself.
--- a/drivers/scsi/hpsa.c~hpsa-use-msleep-instead-of-schedule_timeout-fix
+++ a/drivers/scsi/hpsa.c
@@ -1949,7 +1949,6 @@ static int wait_for_device_to_become_rea
/* Wait for a bit. do this first, because if we send
* the TUR right away, the reset will just abort it.
*/
- set_current_state(TASK_UNINTERRUPTIBLE);
msleep(1000 * waittime);
count++;
@@ -2838,7 +2837,6 @@ static __devinit int hpsa_message(struct
tag = readl(vaddr + SA5_REPLY_PORT_OFFSET);
if (HPSA_TAG_DISCARD_ERROR_BITS(tag) == paddr32)
break;
- set_current_state(TASK_UNINTERRUPTIBLE);
msleep(HPSA_MSG_SEND_RETRY_INTERVAL_MSECS);
}
@@ -2952,7 +2950,6 @@ static __devinit int hpsa_hard_reset_con
pmcsr |= PCI_D3hot;
pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
- set_current_state(TASK_UNINTERRUPTIBLE);
msleep(500);
/* enter the D0 power management state */
@@ -2960,7 +2957,6 @@ static __devinit int hpsa_hard_reset_con
pmcsr |= PCI_D0;
pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr);
- set_current_state(TASK_UNINTERRUPTIBLE);
msleep(500);
/* Restore the PCI configuration space. The Open CISS
@@ -3187,7 +3183,6 @@ static int hpsa_pci_init(struct ctlr_inf
scratchpad = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
if (scratchpad == HPSA_FIRMWARE_READY)
break;
- set_current_state(TASK_UNINTERRUPTIBLE);
msleep(HPSA_BOARD_READY_POLL_INTERVAL_MSECS);
}
if (scratchpad != HPSA_FIRMWARE_READY) {
@@ -3262,7 +3257,6 @@ static int hpsa_pci_init(struct ctlr_inf
if (!(readl(h->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
break;
/* delay and try again */
- set_current_state(TASK_UNINTERRUPTIBLE);
msleep(10);
}
@@ -3302,7 +3296,6 @@ static int __devinit hpsa_init_one(struc
/* Some devices (notably the HP Smart Array 5i Controller)
need a little pause here */
- set_current_state(TASK_UNINTERRUPTIBLE);
msleep(HPSA_POST_RESET_PAUSE_MSECS);
/* Now try to get the controller to respond to a no-op */
diff -puN drivers/scsi/hpsa.h~hpsa-use-msleep-instead-of-schedule_timeout-fix drivers/scsi/hpsa.h
_
next prev parent reply other threads:[~2009-12-08 22:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-08 21:38 [PATCH 0/5] hpsa: fix a few more small things Stephen M. Cameron
2009-12-08 21:38 ` [PATCH 1/5] Use msleep() instead of schedule_timeout Stephen M. Cameron
2009-12-08 21:53 ` James Bottomley
2009-12-08 22:02 ` Andrew Morton [this message]
2009-12-08 21:38 ` [PATCH 2/5] hpsa: rename too generic variable names Stephen M. Cameron
2009-12-08 21:38 ` [PATCH 3/5] hpsa: Return SCSI_MLQUEUE_HOST_BUSY on command allocation failure Stephen M. Cameron
2009-12-08 21:38 ` [PATCH 4/5] hpsa: Fix incorrect SCSI status reporting Stephen M. Cameron
2009-12-16 22:53 ` Stephen Cameron
2009-12-16 22:53 ` Stephen Cameron
2009-12-08 21:38 ` [PATCH 5/5] hpsa: suppress messages due to unsupport SCSI REPORT_LUNS Stephen M. Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091208140245.e654805c.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mikem@beardog.cce.hp.com \
--cc=scameron@beardog.cce.hp.com \
--cc=smcameron@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.