From patchwork Tue Jan 15 15:36:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1979241 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 33423DF264 for ; Tue, 15 Jan 2013 15:36:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753800Ab3AOPgg (ORCPT ); Tue, 15 Jan 2013 10:36:36 -0500 Received: from co1ehsobe001.messaging.microsoft.com ([216.32.180.184]:7933 "EHLO co1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752713Ab3AOPgf (ORCPT ); Tue, 15 Jan 2013 10:36:35 -0500 Received: from mail11-co1-R.bigfish.com (10.243.78.208) by CO1EHSOBE015.bigfish.com (10.243.66.78) with Microsoft SMTP Server id 14.1.225.23; Tue, 15 Jan 2013 15:36:35 +0000 Received: from mail11-co1 (localhost [127.0.0.1]) by mail11-co1-R.bigfish.com (Postfix) with ESMTP id 28AC3180101; Tue, 15 Jan 2013 15:36:35 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 3 X-BigFish: VS3(zcb8kzzz1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275dhz2dh87h2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail11-co1 (localhost.localdomain [127.0.0.1]) by mail11-co1 (MessageSwitch) id 135826419345697_14238; Tue, 15 Jan 2013 15:36:33 +0000 (UTC) Received: from CO1EHSMHS024.bigfish.com (unknown [10.243.78.207]) by mail11-co1.bigfish.com (Postfix) with ESMTP id 0816CB00049; Tue, 15 Jan 2013 15:36:33 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS024.bigfish.com (10.243.66.34) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 15 Jan 2013 15:36:28 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.318.3; Tue, 15 Jan 2013 15:36:25 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.132]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r0FFaMJW025370; Tue, 15 Jan 2013 08:36:23 -0700 From: Shawn Guo To: CC: Chris Ball , Shawn Guo Subject: [PATCH 1/2] mmc: sdhci-esdhc-imx: remove D3CD check from SDHCI_HOST_CONTROL write Date: Tue, 15 Jan 2013 23:36:52 +0800 Message-ID: <1358264213-3611-1-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org SDHCI_CTRL_D3CD is not a standard SDHCI_HOST_CONTROL, so there is no need to check it in SDHCI_HOST_CONTROL write at all. Remove it. Signed-off-by: Shawn Guo Tested-by: Dirk Behme --- drivers/mmc/host/sdhci-esdhc-imx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index ac6f971..322eabf 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -297,10 +297,8 @@ static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg) */ return; case SDHCI_HOST_CONTROL: - /* FSL messed up here, so we can just keep those three */ - new_val = val & (SDHCI_CTRL_LED | \ - SDHCI_CTRL_4BITBUS | \ - SDHCI_CTRL_D3CD); + /* FSL messed up here, so we need to manually compose it. */ + new_val = val & (SDHCI_CTRL_LED | SDHCI_CTRL_4BITBUS); /* ensure the endianness */ new_val |= ESDHC_HOST_CONTROL_LE; /* bits 8&9 are reserved on mx25 */