From patchwork Tue Aug 10 09:47:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zang Roy-R61911 X-Patchwork-Id: 61370 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 73C4AB736A for ; Tue, 10 Aug 2010 20:04:06 +1000 (EST) Received: by ozlabs.org (Postfix) id 9021FB70EF; Tue, 10 Aug 2010 20:03:46 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from VA3EHSOBE001.bigfish.com (va3ehsobe001.messaging.microsoft.com [216.32.180.11]) by ozlabs.org (Postfix) with ESMTP id 13446B70ED for ; Tue, 10 Aug 2010 20:03:46 +1000 (EST) Received: from mail134-va3-R.bigfish.com (10.7.14.245) by VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id 8.1.340.0; Tue, 10 Aug 2010 10:03:42 +0000 Received: from mail134-va3 (localhost.localdomain [127.0.0.1]) by mail134-va3-R.bigfish.com (Postfix) with ESMTP id 909A014D014E; Tue, 10 Aug 2010 10:03:42 +0000 (UTC) X-SpamScore: 2 X-BigFish: VS2(ze80izzz1202hzz1497iz2dh2a8h62h) X-Spam-TCS-SCL: 1:0 Received: from mail134-va3 (localhost.localdomain [127.0.0.1]) by mail134-va3 (MessageSwitch) id 1281434622145979_17639; Tue, 10 Aug 2010 10:03:42 +0000 (UTC) Received: from VA3EHSMHS031.bigfish.com (unknown [10.7.14.238]) by mail134-va3.bigfish.com (Postfix) with ESMTP id DAF50E8046; Tue, 10 Aug 2010 10:03:41 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by VA3EHSMHS031.bigfish.com (10.7.99.41) with Microsoft SMTP Server (TLS) id 14.0.482.44; Tue, 10 Aug 2010 10:03:40 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id o7AA3dUI009660; Tue, 10 Aug 2010 03:03:39 -0700 (MST) Received: from localhost.localdomain (rock.ap.freescale.net [10.193.20.106]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id o7AAF3v9007904; Tue, 10 Aug 2010 05:15:07 -0500 (CDT) From: Roy Zang To: akpm@linux-foundation.org, linux-mmc@vger.kernel.org Subject: [PATCH 2/2] mmc: some nip clean up for the sdhci driver Date: Tue, 10 Aug 2010 17:47:12 +0800 Message-ID: <1281433632-18758-2-git-send-email-tie-fei.zang@freescale.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1281433632-18758-1-git-send-email-tie-fei.zang@freescale.com> References: <1281433632-18758-1-git-send-email-tie-fei.zang@freescale.com> MIME-Version: 1.0 X-Reverse-DNS: az33egw02.freescale.net Cc: linuxppc-dev@ozlabs.org, mirqus@gmail.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org remove the extra line and rewrite the if condition line. Signed-off-by: Roy Zang --- drivers/mmc/host/sdhci-of-core.c | 1 - drivers/mmc/host/sdhci.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c index d059805..732cffd 100644 --- a/drivers/mmc/host/sdhci-of-core.c +++ b/drivers/mmc/host/sdhci-of-core.c @@ -157,7 +157,6 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev, if (of_get_property(np, "sdhci,auto-cmd12", NULL)) host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_AUTO_CMD12; - if (of_get_property(np, "sdhci,1-bit-only", NULL)) host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA; diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 4b7b2d5..a1e6269 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -818,10 +818,9 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, mode = SDHCI_TRNS_BLK_CNT_EN; if (data->blocks > 1) { + mode |= SDHCI_TRNS_MULTI; if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_AUTO_CMD12) - mode |= SDHCI_TRNS_MULTI | SDHCI_TRNS_AUTO_CMD12; - else - mode |= SDHCI_TRNS_MULTI; + mode |= SDHCI_TRNS_AUTO_CMD12; } if (data->flags & MMC_DATA_READ) mode |= SDHCI_TRNS_READ;