From patchwork Sat Mar 4 12:19:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9603903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 82D43602B4 for ; Sat, 4 Mar 2017 12:39:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 727E02843F for ; Sat, 4 Mar 2017 12:39:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 671512854F; Sat, 4 Mar 2017 12:39:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D32342843F for ; Sat, 4 Mar 2017 12:38:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752007AbdCDMi6 (ORCPT ); Sat, 4 Mar 2017 07:38:58 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36382 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751682AbdCDMi5 (ORCPT ); Sat, 4 Mar 2017 07:38:57 -0500 Received: by mail-wm0-f65.google.com with SMTP id v190so6831077wme.3 for ; Sat, 04 Mar 2017 04:38:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=Rb0KBU0dRSz1YBVKo0b07PEui0pe5pMJE9PYPapzcYE=; b=EQen2ppTcLIVUUR5kH66m8m3ar/zcPDVu/EcAMeSGJ0xrPw4rJtrhoD3pXWoic0gNG iRupjV+FmARP7QmI86SggjuGG9VRR2qT0NKwKdbRzAByv6+jYK+AXvJUIbBR3pvRtMp3 H9SKU7xDG+vFHrQxfwZhDCBgKU4+igSDlAL73/9p84/vqgwZ5F2ycD9nfDdw5Hr1T0r3 tTTGGSCj4dx9OV44uF9sJapgMokpi/pAVfBgjm4V0kbkUa1WqOjwU3shyoXbi/GNcBbI 8Jh5UUZfXPed/zJTQzkI3Xx3MPs3+iCDXL9mg0JZF23/tuJ6JSs0KW2Mvf1ydxHixAX2 lauA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=Rb0KBU0dRSz1YBVKo0b07PEui0pe5pMJE9PYPapzcYE=; b=gLCiO61Wxh4Tl6OEgfNx9MWa5eBP/+qeqdY3PirotYjPl+eNmjUCgsR/3c+Igu9BGH NZxrkODXk+Iglv5nVN7C3or5L+UAgZSAVRcILnP/UhTcZbwsRjVqofT8VF3hjWEm1PPx VdwecTETqoHiQpEVIQAx55lJEWLIJLkoyZ9xLWgKXPTbnGtB3MvWa86I6QR9ezE/dWdn oiWtUKJmPpOLKqojdF4ePfK6SjXrcoD2sXK+N9lO/LIjuXW/Y72uGLMMTjJ6fkDPHUvq G9SFHEpRKiZW1o3mHQJQdhyx0Su/3pdvANLe433/HIV7AyKjLK9OCyTqpyebFzwlA79L DBAw== X-Gm-Message-State: AMke39kWkId7CLsNP/h8QNrHjOhtHSxO1vfOoS4uYmb6NhA9i8XrjqAuJ/Ge+b//QKjS/w== X-Received: by 10.28.59.8 with SMTP id i8mr6730383wma.27.1488631093130; Sat, 04 Mar 2017 04:38:13 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:98cd:c51c:6f4e:443? (p200300C6EBDC400098CDC51C6F4E0443.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:98cd:c51c:6f4e:443]) by smtp.googlemail.com with ESMTPSA id o15sm6924515wmd.10.2017.03.04.04.38.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Mar 2017 04:38:12 -0800 (PST) Subject: [PATCH v5 1/10] mmc: meson-gx: simplify bounce buffer setting in meson_mmc_start_cmd To: Ulf Hansson , Kevin Hilman References: Cc: "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org From: Heiner Kallweit Message-ID: <1337c0e2-cbe5-60d5-a25f-8af531ee7808@gmail.com> Date: Sat, 4 Mar 2017 13:19:23 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Core ensures that there are no commands with cmd->data being set and nothing to transfer. And we don't have to reset bit CMD_CFG_DATA_NUM because cmd_cfg was zero-initialized and this bit isn't set. Signed-off-by: Heiner Kallweit Acked-by: Kevin Hilman --- v2: - adjusted commit message because branch xfer_bytes == 0 is never reached - added acked-by v3: - no changes v4: - no changes v5: - no changes --- drivers/mmc/host/meson-gx-mmc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 5a959783..07a7399c 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -516,14 +516,7 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) desc->cmd_cfg &= ~CMD_CFG_DATA_WR; } - if (xfer_bytes > 0) { - desc->cmd_cfg &= ~CMD_CFG_DATA_NUM; - desc->cmd_data = host->bounce_dma_addr & CMD_DATA_MASK; - } else { - /* write data to data_addr */ - desc->cmd_cfg |= CMD_CFG_DATA_NUM; - desc->cmd_data = 0; - } + desc->cmd_data = host->bounce_dma_addr & CMD_DATA_MASK; cmd_cfg_timeout = 12; } else {