From patchwork Fri May 31 22:22:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2645871 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 23AAFDFB79 for ; Fri, 31 May 2013 22:25:04 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiXk6-0006sV-LQ; Fri, 31 May 2013 22:24:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiXjr-0004Ho-Cf; Fri, 31 May 2013 22:23:59 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiXjK-0004AE-LR for linux-arm-kernel@lists.infradead.org; Fri, 31 May 2013 22:23:29 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0LltrB-1U9CyK2yuH-00ZdRL; Sat, 01 Jun 2013 00:23:01 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Subject: [PATCH 04/15] [SCSI] nsp32: use mdelay instead of large udelay constants Date: Sat, 1 Jun 2013 00:22:41 +0200 Message-Id: <1370038972-2318779-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1370038972-2318779-1-git-send-email-arnd@arndb.de> References: <1370038972-2318779-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:2imDeWH65yZmK2vLjZbhLeadmBBJsneRY+JyQLdEa2p vP19715EFZ0irZmi3e5Nl9iAvX0p5XkILVt6P9yyZ2kXa0Sa4O U6WRwVjcqfo9WrjuhQmRf2zQtWorC1x63rGuiEJ0jwqucIIhLQ HKi5UtB+93v6uQO1bATj17StFUI0dWVwUFkwGpLbQ2mwfxJl14 upLee9ha+1NsTzGT77OO8xjkrHVkUtyV9LjBY9PSFQJ5Wr2Dmo 4lu84gEQPmkTK/NPftwzQmi8rdnEWqmQ8xRJFlebyRkAlq1CfX WspQR28v41Jmhe9nBfxNnIpaGTgu/8BfVqm/SfxlaCrhp4qXI6 tnTlsMPAJMNpjKapR/2EV6Lp5mwM3FTys96Hj6auT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130531_182326_971126_57B480EA X-CRM114-Status: UNSURE ( 8.53 ) 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.17.9 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 , "James E.J. Bottomley" , YOKOTA Hiroshi , patches@lists.linaro.org, linux-arm-kernel@lists.infradead.org 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 Acked-by: GOTO Masanori Cc: YOKOTA Hiroshi Cc: "James E.J. Bottomley" Cc: linux-scsi@vger.kernel.org --- 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 */