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: 1720151 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 B90DE3FCDF for ; Fri, 9 Nov 2012 11:48:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752723Ab2KILp5 (ORCPT ); Fri, 9 Nov 2012 06:45:57 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:50224 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752679Ab2KILpz (ORCPT ); Fri, 9 Nov 2012 06:45:55 -0500 Received: by mail-pb0-f46.google.com with SMTP id rr4so2787846pbb.19 for ; Fri, 09 Nov 2012 03:45:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=p05WGwwRQath/hjeGvdN9LxOBHvJIIcc/xqYo4y0SIE=; b=R0sKKM70OC8X4XP5hvhPUGiD3OTusfs+7wCTyHnz44+xHOURemB86fqr56MQQH7tAz tRsy/MgzKjyMGu1F660ZLFetsBExw9P97PHXqqpwx55GE+BY+RBATCvUOgnf9TDaVtRH ahMVRzpKtiCUy2JPNxkowYv2sBsHW/dyaqAFjh/mVPrqjCULY6FGWsb2L2YsJ58F4j6i SwOZInEtcg0NYutjFLkUDPBUnkFund8eXowi13ODEXNMb4Zn6AbGIpZ7uzLz97HFgtBA 4+ienf+D/BtOPS8zWPKJHlzmsuWjUszcIfsiH9Ja78joxhyvdRljdeS2FrUAGuWGeTK3 Iw0A== 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: ALoCoQnWn8xp0oMWX8WzcGAQl+4tNSlrc3IN7j5DSedwQ6tCxb6fZ6OU/CSPLCA96f9YlNSMfGzP Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 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;