From patchwork Mon Sep 22 09:12:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 4947001 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 216129F313 for ; Mon, 22 Sep 2014 10:12:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA9E020149 for ; Mon, 22 Sep 2014 10:12:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9B1F2010E for ; Mon, 22 Sep 2014 10:12:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753198AbaIVKMF (ORCPT ); Mon, 22 Sep 2014 06:12:05 -0400 Received: from mail-bn1bon0119.outbound.protection.outlook.com ([157.56.111.119]:20208 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752300AbaIVKME (ORCPT ); Mon, 22 Sep 2014 06:12:04 -0400 Received: from DM2PR03CA0028.namprd03.prod.outlook.com (10.141.96.27) by BLUPR03MB326.namprd03.prod.outlook.com (10.141.48.16) with Microsoft SMTP Server (TLS) id 15.0.1024.9; Mon, 22 Sep 2014 09:40:06 +0000 Received: from BN1BFFO11FD049.protection.gbl (2a01:111:f400:7c10::1:146) by DM2PR03CA0028.outlook.office365.com (2a01:111:e400:2428::27) with Microsoft SMTP Server (TLS) id 15.0.1024.12 via Frontend Transport; Mon, 22 Sep 2014 09:40:06 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD049.mail.protection.outlook.com (10.58.145.4) with Microsoft SMTP Server (TLS) id 15.0.1029.15 via Frontend Transport; Mon, 22 Sep 2014 09:40:06 +0000 Received: from shlinux1.ap.freescale.net (shlinux1.ap.freescale.net [10.192.225.216]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s8M9dsW8010395; Mon, 22 Sep 2014 02:40:02 -0700 From: Dong Aisheng To: CC: , , , , Subject: [PATCH v2 1/8] mmc: sdhci-esdhc-imx: remove duplicated lines Date: Mon, 22 Sep 2014 17:12:04 +0800 Message-ID: <1411377131-19741-2-git-send-email-b29396@freescale.com> X-Mailer: git-send-email 1.7.8 In-Reply-To: <1411377131-19741-1-git-send-email-b29396@freescale.com> References: <1411377131-19741-1-git-send-email-b29396@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(110136001)(87286001)(68736004)(84676001)(77156001)(47776003)(6806004)(69596002)(83322001)(19580395003)(102836001)(19580405001)(99396002)(107046002)(95666004)(64706001)(105606002)(33646002)(36756003)(20776003)(104016003)(21056001)(2351001)(229853001)(90102001)(44976005)(106466001)(76176999)(50986999)(62966002)(88136002)(92566001)(85306004)(46102003)(77982003)(4396001)(74662003)(80022003)(74502003)(79102003)(81542003)(81342003)(50226001)(85852003)(83072002)(31966008)(92726001)(89996001)(230783001)(48376002)(97736003)(81156004)(26826002)(575784001)(93916002)(104166001)(76482002)(87936001)(50466002)(120916001)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR03MB326; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:; X-Forefront-PRVS: 034215E98F Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=Aisheng.Dong@freescale.com; X-OriginatorOrg: freescale.com Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is already the same register check above, no need the later one. Move them into one place and delete the later one. Signed-off-by: Dong Aisheng --- drivers/mmc/host/sdhci-esdhc-imx.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 587ee0e..256c901 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -315,6 +315,11 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg) data |= ESDHC_CTRL_D3CD; writel(data, host->ioaddr + SDHCI_HOST_CONTROL); } + + if (val & SDHCI_INT_ADMA_ERROR) { + val &= ~SDHCI_INT_ADMA_ERROR; + val |= ESDHC_INT_VENDOR_SPEC_DMA_ERR; + } } if (unlikely((imx_data->socdata->flags & ESDHC_FLAG_MULTIBLK_NO_INT) @@ -335,13 +340,6 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg) } } - if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) { - if (val & SDHCI_INT_ADMA_ERROR) { - val &= ~SDHCI_INT_ADMA_ERROR; - val |= ESDHC_INT_VENDOR_SPEC_DMA_ERR; - } - } - writel(val, host->ioaddr + reg); }