From patchwork Fri Nov 9 11:39:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 12786 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 4D2714C16A7 for ; Fri, 9 Nov 2012 11:46:10 +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 012A2A18790 for ; Fri, 9 Nov 2012 11:46:09 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so2570852iag.11 for ; Fri, 09 Nov 2012 03:46:09 -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=TXqfhdgSqRzzwJfPZbM/OXWR+pm+GKOjDkTlZO+2UE4=; b=faFAxI/1AmhzslZpAcWZId5Y+gzxUZ8k392bXduMrkfThck3CqQDkxhqcEsuajZ3+t EhoqocOEDJy2c0JQRlbHsc7hXCQvoLkyrF+0S2r4ShWEggD3ylTZr5pU2koAuOUv7HZx tTUm9LIBN17j0UpLdKWUY8ZzR2dB3YQtyDcECNcfLirDyU0r3OPj0xbOPiBPvLmwM/9i gmEGnCDXr61fIYMlNMS/vE/9K6F3rqK7lKxawXP0KgeJlSziXn0QJ70h2N/BjCcUmlem QLsvov+SrTPX1RkGw+mAE/HCjOGBY8LxLtM3yokzbYgvI5E9wOZgI7WBbDSYlYqkYhCf MXhQ== Received: by 10.50.173.34 with SMTP id bh2mr1012036igc.70.1352461569459; Fri, 09 Nov 2012 03:46:09 -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 n20csp15762igt; Fri, 9 Nov 2012 03:46:09 -0800 (PST) Received: by 10.66.81.42 with SMTP id w10mr30938762pax.66.1352461568810; Fri, 09 Nov 2012 03:46:08 -0800 (PST) Received: from mail-da0-f46.google.com (mail-da0-f46.google.com [209.85.210.46]) by mx.google.com with ESMTPS id rl8si39400980pbc.82.2012.11.09.03.46.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Nov 2012 03:46:08 -0800 (PST) Received-SPF: neutral (google.com: 209.85.210.46 is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=209.85.210.46; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.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-da0-f46.google.com with SMTP id n41so1666764dak.33 for ; Fri, 09 Nov 2012 03:46:08 -0800 (PST) Received: by 10.66.87.163 with SMTP id az3mr30870938pab.62.1352461568572; Fri, 09 Nov 2012 03:46:08 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id tm8sm17629901pbc.48.2012.11.09.03.46.05 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Nov 2012 03:46:07 -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 5/8] mmc: sdhci: fix coding style in sdhci_do_set_ios Date: Fri, 9 Nov 2012 17:09:55 +0530 Message-Id: <1352461198-21941-6-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: ALoCoQm2cy7h/srLFiz69K5ZGCc5sYyzwQuhwage6JvPYz/6e9bTcpyaOl7rpRe823YXj6MEiFpN Signed-off-by: Tushar Behera --- drivers/mmc/host/sdhci.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 28da461..b947155 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1386,9 +1386,9 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) * or if it requires special setup code, you should implement that in * platform_8bit_width(). */ - if (host->ops->platform_8bit_width) + if (host->ops->platform_8bit_width) { host->ops->platform_8bit_width(host, ios->bus_width); - else { + } else { ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); if (ios->bus_width == MMC_BUS_WIDTH_8) { ctrl &= ~SDHCI_CTRL_4BITBUS; @@ -1467,9 +1467,9 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) clk &= ~SDHCI_CLOCK_CARD_EN; sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); - if (host->ops->set_uhs_signaling) + if (host->ops->set_uhs_signaling) { host->ops->set_uhs_signaling(host, ios->timing); - else { + } else { ctrl_2 = sdhci_readw(host, SDHCI_HOST_CONTROL2); /* Select Bus Speed Mode for host */ ctrl_2 &= ~SDHCI_CTRL_UHS_MASK; @@ -1492,8 +1492,9 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) clock = host->clock; host->clock = 0; sdhci_set_clock(host, clock); - } else + } else { sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); + } /* * Some (ENE) controllers go apeshit on some ios operation,