From patchwork Thu Apr 25 17:28:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2489441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 7B33EDF5B1 for ; Thu, 25 Apr 2013 17:38:53 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVQ6k-00063A-IO; Thu, 25 Apr 2013 17:37:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVQ1U-0007MH-NH; Thu, 25 Apr 2013 17:31:56 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UVPz1-00076P-4i for linux-arm-kernel@lists.infradead.org; Thu, 25 Apr 2013 17:29:30 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MCID3-1UMJ9s0IvB-0098ed; Thu, 25 Apr 2013 19:29:05 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/21] [SCSI] nsp32: use mdelay instead of large udelay constants Date: Thu, 25 Apr 2013 19:28:53 +0200 Message-Id: <1366910944-3033663-11-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1366910944-3033663-1-git-send-email-arnd@arndb.de> References: <1366910944-3033663-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:gH3DuRcIe8HKU2pybRUJB6WaCtBKyUbZbrfP/0IoXvf 9Qekb5VrNN9/+tMDgtUsghwch0Sxic632qKl5a95dk2k9YjSp3 DI5fDS0CNAzI9ruuKWC1w9iVh9vmc57lMTD5JDViFOivUGFAsR 1B3YZ0RIL3P2z1c5cVm8f7HB0Bg5STqKDhx+ZUDyAcdy8AWIS1 u7zmq+CMHFvYbhRloMhfkKe8eNUDGF2dDjQm5GAO/gbcukBzxg MRL8q3yyI/6C2qzXbr6GwtlubVCGzawRKpahDutsWVxEBI6yzz Zl/9PMevS/L/6sYcqN2f0UiwMSR3TL84v1MYQa9WZrLf/USfNu 4r64reADab9JG11qbepXPSiuQ0SK+Ub4wVu0mOzyR X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130425_132923_463927_2F92F2A9 X-CRM114-Status: UNSURE ( 9.25 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.171 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-scsi@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org, "James E.J. Bottomley" , GOTO Masanori , YOKOTA Hiroshi X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org ARM cannot handle udelay for more than 2 miliseconds, so we should use mdelay instead for those. Signed-off-by: Arnd Bergmann Cc: GOTO Masanori Cc: YOKOTA Hiroshi Cc: "James E.J. Bottomley" Cc: linux-scsi@vger.kernel.org Acked-by: GOTO Masanori --- 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 1e3879d..0665f9c 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c @@ -2899,7 +2899,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 */