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: 176432 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Tue, 10 Aug 2010 11:03:52 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OilgW-0001sB-37 for chris@printf.net; Tue, 10 Aug 2010 11:03:52 +0100 Received: by mail.laptop.org (Postfix) id C0469245BE; Tue, 10 Aug 2010 06:03:33 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 5B196245C0 for ; Tue, 10 Aug 2010 06:03:33 -0400 (EDT) X-ASG-Debug-ID: 1281434627-0b7471510001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id 4zIX5le8J6NhTcYi for ; Tue, 10 Aug 2010 06:03:47 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751934Ab0HJKDo (ORCPT ); Tue, 10 Aug 2010 06:03:44 -0400 Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11]:7971 "EHLO VA3EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751048Ab0HJKDn (ORCPT ); Tue, 10 Aug 2010 06:03:43 -0400 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) 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 CC: linuxppc-dev@ozlabs.org, mirqus@gmail.com, cbouatmailru@gmail.com, grant.likely@secretlab.ca X-ASG-Orig-Subj: [PATCH 2/2] mmc: some nip clean up for the sdhci driver 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 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1281434627 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.37573 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 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;