From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20130911042923.452640978@goodmis.org> Date: Wed, 11 Sep 2013 00:30:15 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , GOTO Masanori , YOKOTA Hiroshi , "James E.J. Bottomley" , Subject: [188/251] nsp32: use mdelay instead of large udelay constants References: <20130911042707.738353451@goodmis.org> Content-Disposition: inline; filename=0188-nsp32-use-mdelay-instead-of-large-udelay-constants.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.9-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann [ Upstream commit b497ceb964a80ebada3b9b3cea4261409039e25a ] ARM cannot handle udelay for more than 2 miliseconds, so we should use mdelay instead for those. Signed-off-by: Arnd Bergmann Acked-by: GOTO Masanori Cc: YOKOTA Hiroshi Cc: "James E.J. Bottomley" Cc: linux-scsi@vger.kernel.org Signed-off-by: Steven Rostedt --- drivers/scsi/nsp32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index 62b6168..e705ed3 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c @@ -2926,7 +2926,7 @@ static void nsp32_do_bus_reset(nsp32_hw_data *data) * reset SCSI bus */ nsp32_write1(base, SCSI_BUS_CONTROL, BUSCTL_RST); - udelay(RESET_HOLD_TIME); + mdelay(RESET_HOLD_TIME / 1000); nsp32_write1(base, SCSI_BUS_CONTROL, 0); for(i = 0; i < 5; i++) { intrdat = nsp32_read2(base, IRQ_STATUS); /* dummy read */ -- 1.7.10.4