From patchwork Fri Nov 9 11:39:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 12782 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1FFF14C16A7 for ; Fri, 9 Nov 2012 11:45:56 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id CE2F7A18DFB for ; Fri, 9 Nov 2012 11:45:55 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so5478728iej.11 for ; Fri, 09 Nov 2012 03:45:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=p05WGwwRQath/hjeGvdN9LxOBHvJIIcc/xqYo4y0SIE=; b=VK30FTaiVZpz3zqCZXLMsM4Ow+xPjvt9AoSeLRuoU5VSScLGCk8nGoo34BYXhETQVt 0orm4l1ClRcxf19URLaY7QGYZrYwpBZsuTSdYcYgUM+tvjV+VKdt66i4dsllF1Mvu3YB BMBP+XfXzIHb/NL/6m8MR4SQsTY1pd0xiDo+/h/nYTWxZ3su/jjE3Sd6VDJBNB+f7L4V rj9C4S8vnjnon1JTw/ehijuT7dikdt2itQrgXjKPxhoBXde9Tc/g43W+g1M8ljZtBBSL F+x+eaGGRsWnycoZ5Z63JixbL1dWOWLg7VWz8yu700UKHdf6JDBmKYPACsiXtJK1rc9o Ib3A== Received: by 10.50.187.197 with SMTP id fu5mr489157igc.70.1352461555576; Fri, 09 Nov 2012 03:45:55 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp15732igt; Fri, 9 Nov 2012 03:45:55 -0800 (PST) Received: by 10.68.227.162 with SMTP id sb2mr33614547pbc.4.1352461555004; Fri, 09 Nov 2012 03:45:55 -0800 (PST) Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by mx.google.com with ESMTPS id a6si39079343paw.12.2012.11.09.03.45.54 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Nov 2012 03:45:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.46 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.220.46; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.46 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) smtp.mail=tushar.behera@linaro.org Received: by mail-pa0-f46.google.com with SMTP id hz1so2731172pad.19 for ; Fri, 09 Nov 2012 03:45:54 -0800 (PST) Received: by 10.66.81.199 with SMTP id c7mr31043862pay.19.1352461554741; Fri, 09 Nov 2012 03:45:54 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id tm8sm17629901pbc.48.2012.11.09.03.45.50 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Nov 2012 03:45:53 -0800 (PST) From: Tushar Behera To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Cc: cjb@laptop.org, patches@linaro.org Subject: [PATCH 1/8] mmc: sdhci: fix coding style in sdhci_calc_timeout Date: Fri, 9 Nov 2012 17:09:51 +0530 Message-Id: <1352461198-21941-2-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1352461198-21941-1-git-send-email-tushar.behera@linaro.org> References: <1352461198-21941-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQkFNZSiZ6lE5YBHF1aLGk15zZNxAxQAXTlDwjgBFKr1wZ/OLGddoqooFUcknUrEGzaW4itQ Signed-off-by: Tushar Behera --- drivers/mmc/host/sdhci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index c7851c0..2ff2b9e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -667,9 +667,9 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) return 0xE; /* timeout in us */ - if (!data) + if (!data) { target_timeout = cmd->cmd_timeout_ms * 1000; - else { + } else { target_timeout = data->timeout_ns / 1000; if (host->clock) target_timeout += data->timeout_clks / host->clock;