From patchwork Fri Nov 9 11:39:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 12789 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 532CD4C16A7 for ; Fri, 9 Nov 2012 11:46:20 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id E95F3A18ED9 for ; Fri, 9 Nov 2012 11:46:19 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so2570852iag.11 for ; Fri, 09 Nov 2012 03:46:19 -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=IJolx1Fv87ryPzxFEu4SbYIS4yldfoZh750pCp9T48w=; b=KdqULtnBKFftxTHF7O3bqh3+Vx5M2Z1GDvq9IhI2smLj0zWpby6tPFkscdPrevYsuP yeWhuH6RZjo+1i1CdbA0L6vaRqMulCQwAAUTsDZMbBauK0v65IGMVlpg3Dx4uw4qYFcu zKuh+HoFS/0pXeJZ6R1TrefcTuoIrvJq7HwPRHDyrZW3hJ9iAWdoZ6BC6cqjImhPqxL3 kWl+1gwpGE8hM1npEC30gpzRtOcVI3o1Y757IYGOid7uSaOzvdFuds6env23nYdEFvgU nsVskmswZCVWThImShG9DM7vkh9KCWGTCj7yTR8lboqdRzHwXY0Sj2uVxkYmiCZoYpdD TusA== Received: by 10.50.237.69 with SMTP id va5mr1018034igc.62.1352461579735; Fri, 09 Nov 2012 03:46:19 -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 n20csp15780igt; Fri, 9 Nov 2012 03:46:19 -0800 (PST) Received: by 10.68.228.228 with SMTP id sl4mr33272909pbc.5.1352461579192; Fri, 09 Nov 2012 03:46:19 -0800 (PST) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by mx.google.com with ESMTPS id e3si39034621pax.196.2012.11.09.03.46.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Nov 2012 03:46:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.220.42; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.42 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-f42.google.com with SMTP id fa1so2699390pad.29 for ; Fri, 09 Nov 2012 03:46:19 -0800 (PST) Received: by 10.68.189.70 with SMTP id gg6mr3578012pbc.97.1352461578965; Fri, 09 Nov 2012 03:46:18 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id tm8sm17629901pbc.48.2012.11.09.03.46.15 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Nov 2012 03:46:18 -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 8/8] mmc: sdhci: fix coding style in sdhci_add_host Date: Fri, 9 Nov 2012 17:09:58 +0530 Message-Id: <1352461198-21941-9-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: ALoCoQn05EEQVgNSaMfhEh3isHCKzHi532wQwRDsPw8te04Yy3XLnFlmSFkZW47ZOD1bf/+8HDKD Signed-off-by: Tushar Behera --- drivers/mmc/host/sdhci.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 47cac71..5cddb74 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2786,16 +2786,18 @@ int sdhci_add_host(struct sdhci_host *host) */ mmc->ops = &sdhci_ops; mmc->f_max = host->max_clk; - if (host->ops->get_min_clock) + if (host->ops->get_min_clock) { mmc->f_min = host->ops->get_min_clock(host); - else if (host->version >= SDHCI_SPEC_300) { + } else if (host->version >= SDHCI_SPEC_300) { if (host->clk_mul) { mmc->f_min = (host->max_clk * host->clk_mul) / 1024; mmc->f_max = host->max_clk * host->clk_mul; - } else + } else { mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_300; - } else + } + } else { mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200; + } host->timeout_clk = (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT; @@ -2860,12 +2862,13 @@ int sdhci_add_host(struct sdhci_host *host) mmc_hostname(mmc)); host->vqmmc = NULL; } - } - else if (regulator_is_supported_voltage(host->vqmmc, 1800000, 1800000)) + } else if (regulator_is_supported_voltage(host->vqmmc, + 1800000, 1800000)) { regulator_enable(host->vqmmc); - else + } else { caps[1] &= ~(SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_DDR50); + } /* Any UHS-I mode in caps implies SDR12 and SDR25 support. */ if (caps[1] & (SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 | @@ -2921,8 +2924,9 @@ int sdhci_add_host(struct sdhci_host *host) mmc_hostname(mmc)); host->vmmc = NULL; } - } else + } else { regulator_enable(host->vmmc); + } #ifdef CONFIG_REGULATOR if (host->vmmc) {