From patchwork Wed Mar 22 21:33:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9640115 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 C3FF360327 for ; Wed, 22 Mar 2017 21:34:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B58AC2521E for ; Wed, 22 Mar 2017 21:34:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA5AA262F2; Wed, 22 Mar 2017 21:34:48 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6EF202521E for ; Wed, 22 Mar 2017 21:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:References:To:Subject:From:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RgkNcGsbWONie7K99dHIKkCM1JItaHLdmGHeHKiTTyI=; b=L13IwEacM4rzix LuCPuyA9Jfw7vog7I4b1TW396lwzTguwMFF4gaVuKyed8Jg3o0C8OQOI19me4S0jvd1ThIboz8XdQ CgTR3qabn/VqxmgBnYpbAn/l0jiMzufU7+Cg2Sl3NlPunm4Zj6g2ObgKY66WWu8WVnF/RCmS0nAyu 7wHf/ei0u959yE3MJqY0E/y2t7VXePf1/PPr39eb/MtdMG3HYnpE0cUJbKy22rEV8cBTNZusPRHY7 hjAVLxw0jJwrVJW9zPN93r+4EIyTRkKc1W4QtayLAPnif6KFmf3YVGMn57Ax0ZZToSOtV3EBLEnzl 14FoOWOh4lw/n30K+QXw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cqnty-00056F-Ei; Wed, 22 Mar 2017 21:34:42 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqntr-0004yG-5Z for linux-amlogic@lists.infradead.org; Wed, 22 Mar 2017 21:34:39 +0000 Received: by mail-wr0-x242.google.com with SMTP id u108so28655500wrb.2 for ; Wed, 22 Mar 2017 14:34:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=OSojAVU3EP1gr2McUsunVmQL2w9SZB+PODCGoNq0sOA=; b=RhC2fvKWASN7l8NM8McJXfsD98RiUnewK6riADbXrohZj30JL6yb4YWYJxeqf1LbCq DJhYouP1xtrkJOrhHx7TLIKFXGW+W9BGpwpuFZTknatRM9lZ33clyaSM25y64+cmnboX DuzzJRhmPbQy3q4WgtXA7iZXnzsP53v3Z5qSiO/Tgx5TbZcmZSDHGBDqA79S/tiCjUPp b2yoAuiVo6IeUCyypx5Af83+dKRQmFQipMvtk72QRz3LnTWdEl2yKes5K4OIBvuU1YCK qZpZ2zK7NzlAFGyCi93Q77hpcFgiqDy9LpjCnBniPQjh8BqBS6ajJRwqey/8C7Ty+Hcc XDKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=OSojAVU3EP1gr2McUsunVmQL2w9SZB+PODCGoNq0sOA=; b=NIe8eaw6f5bQQXNlhTmf68BZ3MBddrwgU8SDRNpJvEux5NkbkzK3i7uzUcnVHkS8tr RK+68U5ZPE/3mG2orrO44IUR+Y/DOziiYp0Rzr8aHKhb5SONgBNLZ4f5CpVN2KwSo+lY A8nP+6epXyh6NJ5aYBCPENgNhOfffds9FZJ9sEhDhgPXEtLpWciaAPeu0Afg5iJGvdwZ h1n1ufZSXcjl/5ANlZ7rbRAeM9+uAabmg12JzaFW1Jg1ytazubOxEKq5zDGePOkAt/na ntp0LpadDJL6oa9HuwzX/KiaJwC8oczeZzm/+s/2t7WvL1C2fYEOaFuwznM2xZD660lk VWkw== X-Gm-Message-State: AFeK/H1srV1qwd1ScX2hxUvP7rs7HYCYjWPw7wEKlVFi8N0Cm004gFNCEfmFEVgU3qraUw== X-Received: by 10.223.168.80 with SMTP id l74mr38993630wrc.184.1490218452990; Wed, 22 Mar 2017 14:34:12 -0700 (PDT) Received: from ?IPv6:2003:c6:ebdc:4000:94d5:56f1:aebf:596a? (p200300C6EBDC400094D556F1AEBF596A.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:94d5:56f1:aebf:596a]) by smtp.googlemail.com with ESMTPSA id t21sm1815669wmd.19.2017.03.22.14.34.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 14:34:12 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 2/6] mmc: meson-gx: replace cmd->data in meson_mmc_start_cmd To: Ulf Hansson , Kevin Hilman References: <8bf58a83-d8d7-615c-c89b-87a62a3c9c40@gmail.com> Message-ID: <8c9c00f8-fd74-c9ae-552e-f518ae7844ce@gmail.com> Date: Wed, 22 Mar 2017 22:33:44 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <8bf58a83-d8d7-615c-c89b-87a62a3c9c40@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170322_143435_365485_4D1527A1 X-CRM114-Status: GOOD ( 10.54 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, "linux-mmc@vger.kernel.org" Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Replace cmd->data with a local variable to simplify code a little. Signed-off-by: Heiner Kallweit --- drivers/mmc/host/meson-gx-mmc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 04a55577..1b20ec1a 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -424,6 +424,7 @@ static void meson_mmc_request_done(struct mmc_host *mmc, static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) { struct meson_host *host = mmc_priv(mmc); + struct mmc_data *data = cmd->data; struct sd_emmc_desc *desc, desc_tmp; u32 cfg; u8 blk_len, cmd_cfg_timeout; @@ -456,41 +457,41 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) } /* data? */ - if (cmd->data) { + if (data) { desc->cmd_cfg |= CMD_CFG_DATA_IO; - if (cmd->data->blocks > 1) { + if (data->blocks > 1) { desc->cmd_cfg |= CMD_CFG_BLOCK_MODE; desc->cmd_cfg |= - (cmd->data->blocks & CMD_CFG_LENGTH_MASK) << + (data->blocks & CMD_CFG_LENGTH_MASK) << CMD_CFG_LENGTH_SHIFT; /* check if block-size matches, if not update */ cfg = readl(host->regs + SD_EMMC_CFG); blk_len = cfg & (CFG_BLK_LEN_MASK << CFG_BLK_LEN_SHIFT); blk_len >>= CFG_BLK_LEN_SHIFT; - if (blk_len != ilog2(cmd->data->blksz)) { + if (blk_len != ilog2(data->blksz)) { dev_dbg(host->dev, "%s: update blk_len %d -> %d\n", __func__, blk_len, - ilog2(cmd->data->blksz)); - blk_len = ilog2(cmd->data->blksz); + ilog2(data->blksz)); + blk_len = ilog2(data->blksz); cfg &= ~(CFG_BLK_LEN_MASK << CFG_BLK_LEN_SHIFT); cfg |= blk_len << CFG_BLK_LEN_SHIFT; writel(cfg, host->regs + SD_EMMC_CFG); } } else { desc->cmd_cfg |= - (cmd->data->blksz & CMD_CFG_LENGTH_MASK) << + (data->blksz & CMD_CFG_LENGTH_MASK) << CMD_CFG_LENGTH_SHIFT; } - cmd->data->bytes_xfered = 0; - xfer_bytes = cmd->data->blksz * cmd->data->blocks; - if (cmd->data->flags & MMC_DATA_WRITE) { + data->bytes_xfered = 0; + xfer_bytes = data->blksz * data->blocks; + if (data->flags & MMC_DATA_WRITE) { desc->cmd_cfg |= CMD_CFG_DATA_WR; WARN_ON(xfer_bytes > host->bounce_buf_size); - sg_copy_to_buffer(cmd->data->sg, cmd->data->sg_len, + sg_copy_to_buffer(data->sg, data->sg_len, host->bounce_buf, xfer_bytes); - cmd->data->bytes_xfered = xfer_bytes; + data->bytes_xfered = xfer_bytes; dma_wmb(); }