From patchwork Wed Mar 22 21:33:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9640099 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 B117A60327 for ; Wed, 22 Mar 2017 21:34:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A232D2521E for ; Wed, 22 Mar 2017 21:34:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96FF3262F2; Wed, 22 Mar 2017 21:34:32 +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 29E552521E for ; Wed, 22 Mar 2017 21:34:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753812AbdCVVea (ORCPT ); Wed, 22 Mar 2017 17:34:30 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34742 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753654AbdCVVeQ (ORCPT ); Wed, 22 Mar 2017 17:34:16 -0400 Received: by mail-wm0-f66.google.com with SMTP id u132so13036718wmg.1 for ; Wed, 22 Mar 2017 14:34:15 -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=qXGojC1HhhKaDThTmFjB/IKDDJF+97yXgZ2iVLq83yU=; b=Ww/PTUL1baq1z6fdNyFbhp29aP5carK5K34dM9RyL2tdCgigMfzqDw3YagP+eap5Nv GDCSCX58Gy63Gx8D1bdPY7vxTra5QaupUR0hCw6JyA8rmEmO3A0FCfbVZ1hqjw/v7ssS GUf6iS90+O6UrDqalAQG5h7AXehY5ks8JRn3qe/90vutCvYToTcfsS3lmOhWnLvf3Myi JNk4gUsc1QS/nGBssCC7VX1rzxdXUMq+DFpTn5YdrBJ/PI97IihrjEy70G81ouZjNDdu Zp66zMeG6ctG5qZY1dm0KdCTvTBop/vs9Dig5ujYP8yT800wHfIhXo2B7537QLZ9KEjN UWeQ== 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=qXGojC1HhhKaDThTmFjB/IKDDJF+97yXgZ2iVLq83yU=; b=CiLaq1s5rQnBXicCmrA6mJkdgY/IiL7PtsK6PqJV68H89Bau/u+laDHEX5KsdFe6wm VYoU8OBX8NKCZ9W9OMCI74rcfYdFYr6Emri/hHRMx2rcbifLSVbUrzrhDwTjRZIpmbqg CTCAGYixnMW84l/eK+dzLnQuGN68/v/pV9rCLpG22H7uar7TxVMo0eKAK3RqbLBga6g3 3BgACwGzAYCfLt83glOiZLzOPAeJCIbW/VKgVpvVXP9o8qJa93sU5a+LOEnQvetPiuco cQ9EAIVR1xbd771/FgejNFpPzgepLljGQVfMOQD1Qu/7ficXF4O0BU8KLuj4HhRfsu1f RCgg== X-Gm-Message-State: AFeK/H3orRVXtBC6uUNNZFNlm3TYyClaZa2vDkmq/KU1+fsMebclh4DO4bDN2IPeJWsx5A== X-Received: by 10.28.153.196 with SMTP id b187mr9520534wme.53.1490218454278; Wed, 22 Mar 2017 14:34:14 -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 191sm1744451wmv.25.2017.03.22.14.34.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 14:34:13 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 3/6] mmc: meson-gx: improve variable usage in meson_mmc_start_cmd To: Ulf Hansson , Kevin Hilman References: <8bf58a83-d8d7-615c-c89b-87a62a3c9c40@gmail.com> Cc: "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org Message-ID: <61dca1b6-aabb-5934-f389-590761c40982@gmail.com> Date: Wed, 22 Mar 2017 22:33:47 +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> 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 Simplify the code by using two variables instead of a struct sd_emmc_desc. Signed-off-by: Heiner Kallweit --- drivers/mmc/host/meson-gx-mmc.c | 55 ++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 1b20ec1a..8bf3eb54 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -425,45 +425,39 @@ 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; + u32 cfg, cmd_cfg = 0, cmd_data = 0; u8 blk_len, cmd_cfg_timeout; unsigned int xfer_bytes = 0; /* Setup descriptors */ dma_rmb(); - desc = &desc_tmp; - memset(desc, 0, sizeof(struct sd_emmc_desc)); - desc->cmd_cfg |= (cmd->opcode & CMD_CFG_CMD_INDEX_MASK) << - CMD_CFG_CMD_INDEX_SHIFT; - desc->cmd_cfg |= CMD_CFG_OWNER; /* owned by CPU */ - desc->cmd_arg = cmd->arg; + cmd_cfg |= (cmd->opcode & CMD_CFG_CMD_INDEX_MASK) << + CMD_CFG_CMD_INDEX_SHIFT; + cmd_cfg |= CMD_CFG_OWNER; /* owned by CPU */ /* Response */ if (cmd->flags & MMC_RSP_PRESENT) { if (cmd->flags & MMC_RSP_136) - desc->cmd_cfg |= CMD_CFG_RESP_128; - desc->cmd_cfg |= CMD_CFG_RESP_NUM; - desc->cmd_resp = 0; + cmd_cfg |= CMD_CFG_RESP_128; + cmd_cfg |= CMD_CFG_RESP_NUM; if (!(cmd->flags & MMC_RSP_CRC)) - desc->cmd_cfg |= CMD_CFG_RESP_NOCRC; + cmd_cfg |= CMD_CFG_RESP_NOCRC; if (cmd->flags & MMC_RSP_BUSY) - desc->cmd_cfg |= CMD_CFG_R1B; + cmd_cfg |= CMD_CFG_R1B; } else { - desc->cmd_cfg |= CMD_CFG_NO_RESP; + cmd_cfg |= CMD_CFG_NO_RESP; } /* data? */ if (data) { - desc->cmd_cfg |= CMD_CFG_DATA_IO; + cmd_cfg |= CMD_CFG_DATA_IO; if (data->blocks > 1) { - desc->cmd_cfg |= CMD_CFG_BLOCK_MODE; - desc->cmd_cfg |= - (data->blocks & CMD_CFG_LENGTH_MASK) << - CMD_CFG_LENGTH_SHIFT; + cmd_cfg |= CMD_CFG_BLOCK_MODE; + cmd_cfg |= (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); @@ -479,15 +473,14 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) writel(cfg, host->regs + SD_EMMC_CFG); } } else { - desc->cmd_cfg |= - (data->blksz & CMD_CFG_LENGTH_MASK) << - CMD_CFG_LENGTH_SHIFT; + cmd_cfg |= (data->blksz & CMD_CFG_LENGTH_MASK) << + CMD_CFG_LENGTH_SHIFT; } data->bytes_xfered = 0; xfer_bytes = data->blksz * data->blocks; if (data->flags & MMC_DATA_WRITE) { - desc->cmd_cfg |= CMD_CFG_DATA_WR; + cmd_cfg |= CMD_CFG_DATA_WR; WARN_ON(xfer_bytes > host->bounce_buf_size); sg_copy_to_buffer(data->sg, data->sg_len, host->bounce_buf, xfer_bytes); @@ -495,24 +488,24 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) dma_wmb(); } - desc->cmd_data = host->bounce_dma_addr & CMD_DATA_MASK; + cmd_data = host->bounce_dma_addr & CMD_DATA_MASK; cmd_cfg_timeout = ilog2(SD_EMMC_CMD_TIMEOUT_DATA); } else { cmd_cfg_timeout = ilog2(SD_EMMC_CMD_TIMEOUT); } - desc->cmd_cfg |= (cmd_cfg_timeout & CMD_CFG_TIMEOUT_MASK) << - CMD_CFG_TIMEOUT_SHIFT; + cmd_cfg |= (cmd_cfg_timeout & CMD_CFG_TIMEOUT_MASK) << + CMD_CFG_TIMEOUT_SHIFT; host->cmd = cmd; /* Last descriptor */ - desc->cmd_cfg |= CMD_CFG_END_OF_CHAIN; - writel(desc->cmd_cfg, host->regs + SD_EMMC_CMD_CFG); - writel(desc->cmd_data, host->regs + SD_EMMC_CMD_DAT); - writel(desc->cmd_resp, host->regs + SD_EMMC_CMD_RSP); + cmd_cfg |= CMD_CFG_END_OF_CHAIN; + writel(cmd_cfg, host->regs + SD_EMMC_CMD_CFG); + writel(cmd_data, host->regs + SD_EMMC_CMD_DAT); + writel(0, host->regs + SD_EMMC_CMD_RSP); wmb(); /* ensure descriptor is written before kicked */ - writel(desc->cmd_arg, host->regs + SD_EMMC_CMD_ARG); + writel(cmd->arg, host->regs + SD_EMMC_CMD_ARG); } static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)