From patchwork Wed Dec 12 14:38:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1867171 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3CE253FC81 for ; Wed, 12 Dec 2012 14:38:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754569Ab2LLOi1 (ORCPT ); Wed, 12 Dec 2012 09:38:27 -0500 Received: from moutng.kundenserver.de ([212.227.126.186]:57914 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754268Ab2LLOiZ (ORCPT ); Wed, 12 Dec 2012 09:38:25 -0500 Received: from axis700.grange (dslb-146-060-250-080.pools.arcor-ip.net [146.60.250.80]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0MAuhQ-1Tsj5G30kO-00ATLP; Wed, 12 Dec 2012 15:38:23 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 8949F105E7; Wed, 12 Dec 2012 15:38:21 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1TinRy-0004iC-Pr; Wed, 12 Dec 2012 15:38:18 +0100 From: Guennadi Liakhovetski To: linux-mmc@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm , Chris Ball , Teppei Kamijou , Shinya Kuribayashi Subject: [PATCH 05/14] mmc: sh_mmcif: Use msecs_to_jiffies() for host->timeout Date: Wed, 12 Dec 2012 15:38:09 +0100 Message-Id: <1355323098-18061-6-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1355323098-18061-1-git-send-email-g.liakhovetski@gmx.de> References: <1355323098-18061-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:S7wHVOP5Ius3ckZPuAHnFT9p9uegGKMuLTP3njeCWnU k538fs2iazIFgGC3tUNMctpYZJfxfNdI3r9sGgaVjDK3Qb8rJl gKPcqvPm3un1i29CsEP8WfzDKLwtNL0IZ3UZcdpUFYz46b8RNp 6d7uTzp1TR7bVFi2RHhGajxmNA0xIgN/C0kakCUkRetG5Aaupq pJPxHxxA/xsFTAH9apqKSZ2qJamCmn45anm5RAtWckGFg183Pp +wcy/oOf6+5+/Y9CoYeXvb8GXapXoTfOpCNYQThuaPBMjzJH+b Crt2uWS1iK4OBaazbCPigQ49ksnspps9fp9oc685Oi1Iz8JaDO ShyAbbQH+WPoYwtQQIIenUicEVTsO3eoW4QjgYfG4XnMcbqa5d /lMYt4111p4Sw== Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Teppei Kamijou Timeout period should be properly normalized using msecs_to_jiffies(). Signed-off-by: Teppei Kamijou Signed-off-by: Shinya Kuribayashi Signed-off-by: Guennadi Liakhovetski --- drivers/mmc/host/sh_mmcif.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 1ec3339..1665ae4 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1348,7 +1348,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) host = mmc_priv(mmc); host->mmc = mmc; host->addr = reg; - host->timeout = 1000; + host->timeout = msecs_to_jiffies(1000); host->pd = pdev;