From patchwork Wed May 27 10:13:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dong Aisheng X-Patchwork-Id: 6489101 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ED200C0020 for ; Wed, 27 May 2015 10:29:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 179F92066F for ; Wed, 27 May 2015 10:29:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DE59206AB for ; Wed, 27 May 2015 10:29:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751357AbbE0K27 (ORCPT ); Wed, 27 May 2015 06:28:59 -0400 Received: from mail-bn1bon0119.outbound.protection.outlook.com ([157.56.111.119]:14517 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751495AbbE0K26 (ORCPT ); Wed, 27 May 2015 06:28:58 -0400 X-Greylist: delayed 863 seconds by postgrey-1.27 at vger.kernel.org; Wed, 27 May 2015 06:28:58 EDT Received: from CH1PR03CA010.namprd03.prod.outlook.com (10.255.156.155) by BN3PR03MB1382.namprd03.prod.outlook.com (10.163.34.156) with Microsoft SMTP Server (TLS) id 15.1.172.22; Wed, 27 May 2015 10:14:34 +0000 Received: from BN1AFFO11FD042.protection.gbl (10.255.156.132) by CH1PR03CA010.outlook.office365.com (10.255.156.155) with Microsoft SMTP Server (TLS) id 15.1.172.22 via Frontend Transport; Wed, 27 May 2015 10:14:35 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; lists.infradead.org; dkim=none (message not signed) header.d=none; 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; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD042.mail.protection.outlook.com (10.58.52.253) with Microsoft SMTP Server (TLS) id 15.1.172.14 via Frontend Transport; Wed, 27 May 2015 10:14:34 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t4RAESMU006521; Wed, 27 May 2015 03:14:32 -0700 From: Dong Aisheng To: CC: , , , , , Subject: [PATCH 1/6] mmc: sdhci-esdhc-imx: merge the same register check into one place Date: Wed, 27 May 2015 18:13:26 +0800 Message-ID: <1432721611-31214-2-git-send-email-aisheng.dong@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432721611-31214-1-git-send-email-aisheng.dong@freescale.com> References: <1432721611-31214-1-git-send-email-aisheng.dong@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD042; 1:5wiaTBeYbHfEZO6kPiAInIV4OF3dHLV///0OCthhr4h7n0GnREB3l2ZSNFEBYJnUDxyIaG7mTBweGVf172R534MSlev6/4L1jr/LOQQhwrbox/mn6bhzsWJOtVJzAZXzHm/A9RyRoa6bpsydcvoTL+fhKRDSGIqCsLWgXDj6Y0W9lalFDLX4+Q/e49tu9mcBxOTevWhrH+T3pHklWniB2gKRgEyulHpLKX5lkPToWvLyoCQtQB+DiwmvO/hJkEj817HP0bkD9EbfEfCYMRkoxHD+UOyDswB7Rg6jdKLfuzZsVBBbGcGgR0BA1tN1tcTKa6VxdKo32ae3gOV7/RKhbA== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(339900001)(189002)(199003)(81156007)(6806004)(189998001)(110136002)(92566002)(5001960100002)(77156002)(76176999)(68736005)(50986999)(2950100001)(77096005)(97736004)(33646002)(104016003)(85426001)(36756003)(4001540100001)(105606002)(19580405001)(19580395003)(69596002)(86362001)(50466002)(46102003)(64706001)(48376002)(230783001)(5001830100001)(50226001)(2351001)(62966003)(87936001)(5001860100001)(47776003)(106466001)(229853001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR03MB1382; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1382; 2:w4xq8GBxQWXmXlQOD21w7g3mf/E9mMtsUupPTrY+5gyAOx1l01C+HPaYMtfuj9PF; 2:XH117GwKuCVGqmzgP5xfG+hJPlOHTmVt8OgyxEutd92DGPEvYhb0kQCMRAcVZvoK4xcIfBhN7PAmWPbyBkirKk2Hs4gGsX9Dzc9BNKm5a8Bj/q+55wA+Vvnw7R1WppOc+ImRpcDgu5txRpJozBQYyqGynjozV0iCsP2uSuYG9IxZzehZ3l1KWAfk6uHyJghlzOEzyhX27YuOynjVt7vDmhOcodZ5qM3JM3rCKqK3ZdA=; 6:n16+9ohklrmNRVHWHUSFHIlVCeGl8MhI9aDPlm3XrWyw1+hqM4kVQzSWxZEZozjpKUlsbNEWYKVPjJzdRfxpUeotOU39CeNvBpYqMYR68i57HoO8V8IinT0a3L7A0qg4l0wtIzaCqqIMkFCjbNu+PJI6Wx2fSaj2/HM45FntEpQ+6SgEerVixoFRAstOxLCbEuvf/oUWsjpuYf3lMIKV2+4XgsswYhDy+WtyzAIA0fEn1l5viykg1kzKCXMjM4yxQjY38dAIQdWoohOnrcIkGYUAfTk/2sh7EWLbf6S9eKDeZuh3yjn4v8YXuQ0zlLZoT6Uhis4P6//H9ctUidV2HQ==; 3:LF0m+3v5RU9T/Rv7nFQoAzjXD8vZKvL+9LyPjx1NIeRrRASYURXzIqz0+83Uc/BNjVF9V80wVkM2PbfQUBmXhfG1Ook8BVhTHSioAEg/KRd4o3QlZbOrt2HW9d0CeTGXxpZW7S9pa+sB/MuPLilBsBs4AjOmjSFOfmxmXZehFvtrvGk23b5z9rJDK+3JER+gMZ/lQzCugbDVQhC4T68/s70w4Cy65hkqtXyk9+uVsuq2yeyee7DOg4njny0mooMVhSKSzmOF2kInwdu+d2LmRdQPkhWqE F9J2xuH3cgHuoR2ZCZRK4rESHf+mOubOxOS X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB1382; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:BN3PR03MB1382; BCL:0; PCL:0; RULEID:; SRVR:BN3PR03MB1382; X-Forefront-PRVS: 05891FB07F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB1382; 9:yCbMjFNfwIUV1rpL0aimIolkheI12i+oetHtzRUO1W?= =?us-ascii?Q?lHteBrc+3qUp/JoNHtws6ex7GbFrwHBZKhVBsTW8x0N5gtgBYu+grzDNtQRt?= =?us-ascii?Q?cJMY2Es9HBEBhqVmxD5DIFXPuy9tnkqCIvRvLErrFk7O0GWDmi6//RQ1O7jv?= =?us-ascii?Q?OVQWca14dah5DCoxGnelv9Ryv1zrEn4coY6IbatKDhGHOJ5V07eWCFJ9bGAi?= =?us-ascii?Q?iMRVrJpd0a19MuczhMqrrFHVHM+H+JaaiN3s010rApzMi7WpTVHn4WU0lAx7?= =?us-ascii?Q?IGTVoJ3mME+UJ8ZszxxZ4yuYXDjUQq7xJ9d6Q8Yy2TMugPQzHrKncMiOAaCO?= =?us-ascii?Q?1wqAe78iPG5bRCrk9JRJdevfTRWhZPm6eMkEnTrGqt0glVHkF0hXplq2LRit?= =?us-ascii?Q?MMpnJHowq8iKythY6C0Y0+mWh86bI26XfUrKAduBRlWTedLwcOz1hOXXlCo0?= =?us-ascii?Q?SVVgmBY2lLPe7ot+n+TWWyDxMcpUii08VaM0/qaSBtipLU+GkSp8yYsQFun1?= =?us-ascii?Q?GWQPM/XTGPvR/WbjKY4gjlVaeXKv3NZqy5e5Kce91rL/dx95aE74uJ/6CRkO?= =?us-ascii?Q?gIJNR1qDkD29KcA5Fow17yKW6knSS85t1OW+KU92j3OiSts5AjGwdV5esyu8?= =?us-ascii?Q?F2Yuy2CN9uHO3xNpA8ueLNcNgXJmfgVswqhNj7v8HAQA/fEJjOPh0J53G0S3?= =?us-ascii?Q?6n8DCYCnOitzHHAx+t/xCpXScAzO+YWqRAbFaRUyhYKpLsUR3dsS+c73sbB0?= =?us-ascii?Q?ZxzNRfgVGXe19LbsM69DX92nPIDj9GUwwWjNdrewMm9z4NmUf/eIUQ30Omop?= =?us-ascii?Q?dRdfEgAlqUa/nxAD+5Lrme/0FffUR6p3CpYxjclkvDL17Wi1d9TuPDfoK66/?= =?us-ascii?Q?UiDlS9M4QqfeBMGFYaEdkQdqsxLHRRXeKDuMdViSH4Yo1BxQX1sXNAr5KY9k?= =?us-ascii?Q?rjfJx+RnoeL2uGH4YHcwHhssXNtyC1zxRr171KoLyjoHBAlPJjZc/Ak9JxCr?= =?us-ascii?Q?gRoRTWG3E2kYYRgijxfd4S4qA3AKyyCtorBgLdVc5ArkAfgQm4rcIi1sLcS8?= =?us-ascii?Q?Qc7zC0DpsuGoWEwfh6/zYh4KCm?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB1382; 3:DicajEJwOcyA/LInxVcj2E5XPCcBUrCriTkr6J+0YxT3H4vbsIhZUYR8g+D+ptcA8kioI2N5TrikoUnKPmEl1LqWRS09GSrPl33JnS1EbgdXvTxhFhEh6ebRtmmpxFDS8BdLNoNXsZ72Obe2hf6biQ==; 10:Y10c9ZhmyRb9Lf2h0Bj73SuOAAUFyA3T2Lkr7ZYzOBUWHVZWA8PEUYLbEavpkRblfVL7EJxHyKqDwAiJPbQ3C6Nsm5TH6xoxsUmIjW8KF8w=; 6:rz4S5epjaNeVXunQ+QQ0p8jCF3Q7g7NKSmndZ27hi+3GRgAmFuQdf6X6E7aXblGl X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2015 10:14:34.7699 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB1382 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 In esdhc_writel_le() function, there's duplicated checking of the same register as follows: "if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE))". Merge them into one and remove the duplicated one. Signed-off-by: Dong Aisheng --- drivers/mmc/host/sdhci-esdhc-imx.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index ef290a5..0c89293 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -313,6 +313,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) @@ -333,13 +338,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); }