From patchwork Wed Mar 22 21:34:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9640121 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 2EAB060327 for ; Wed, 22 Mar 2017 21:34:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 202A62521E for ; Wed, 22 Mar 2017 21:34:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15430262F2; Wed, 22 Mar 2017 21:34:53 +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=ham 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 CB9542521E for ; Wed, 22 Mar 2017 21:34:52 +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=hWYAz+IlzQfFyzYp+oWUwJ3/Yjs9QoSNZPstZ2Tyr7A=; b=Jle3eDExRFpQ1i Razfkl+zmqs1k4k36+DM+6N3ubzCEsaFR94VSFqvNTqLK3uSfWELesBbFCtIikpdCkBXtYQuf2Cvq 6FUvN2iIQoHFrSJWQaVIovpdYV1AofIM+E4BmbkcBW0XIujRnwjXfTItPIhWGFHxRaZ9T2jz5ag6Q vrO0XS4dqCl5zxMRV/6XlXDkBOthJvrRD9wBYF/xWfOWZaywfyg2z0JHv0iT4btW630S0g6iGzA/f /ZoWQNh93PwDLhxPjq7XcqdUOUTIlqVvaQtPfoj9wHH284kZzYRhsJU74HpLzPOhbBGvJIhGy1YrX WH7I6n8zvcrJ0nLWy9nA==; 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 1cqnu3-0005AP-2k; Wed, 22 Mar 2017 21:34:47 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cqntu-0004yp-AK for linux-amlogic@lists.infradead.org; Wed, 22 Mar 2017 21:34:42 +0000 Received: by mail-wm0-x243.google.com with SMTP id x124so13082397wmf.3 for ; Wed, 22 Mar 2017 14:34:19 -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=koJS8rhjuJ64oJm3SAsz/McZHLM/fQLHH5DQtzqT9fQ=; b=u+f5PJpcJP3/MeQv42j+80dRIT33R8c5Gnz62wBueTL0geFSLK04Cp/UTySMU+U2zq a7cHzpj8Uw+MlZqyGpY1Udpc/yrcoB8aIiCJUXbQwa3Ft+mOiEiBxgYPFKj6zsha4eFq 5Aw11q93p/OgopEj9+DGQgvahpL2OhWBIR4a28X+iEo1Hvtp9SVDyLc89MXRQtZbGOSX t9Zdvm+TM8jlXpwB4vMna04l3+xyAAsHoSdPRY6nACUtk6J2+MbG48TH5hQalnpWXByk 03lLWS3uh5SyR+Ww5W2KrgjbCz4O1IvrOIoHjxjkHDJOD8CZi8gzbOfx/uYARqsxPv07 FGWQ== 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=koJS8rhjuJ64oJm3SAsz/McZHLM/fQLHH5DQtzqT9fQ=; b=IiH+Y7HLXSaniTDOBnwTlSujQekVpRiOBf6P+8wXLerTY2kaWlLJWqSbvCO1nP8LQI oH8/Bh9d0SvqDnJ0BUnkfSjuO2OyHEW6lk/n0MqYff0S2X4SxCkBXFEkWMlIHdAvmS35 1p5xoWL8A5122r7qO6/h7IBudW4r+dHSFObHpUhVVlm3XT8DAT5QTVmpd+mq4qBK1Ik2 VCRVPuS2ANN18aGaWzklZxudEUatKk38PL093mzY5ZzVJiJ4hMVzCt52tKUBZx69JJWu WOf3g9e/H0AtSrqzFz67cUPyO204f7kBbOLfwLMxYKi4JwprabHVCRZv7VaVHeqLN6cY fVNA== X-Gm-Message-State: AFeK/H2xABlMbb5q9U5RyXuVEJiRpkVucjdp0IM7W6GK4P1gAoGfH8JM9/Gb+0c3kNOTPQ== X-Received: by 10.28.166.208 with SMTP id p199mr9943393wme.25.1490218458088; Wed, 22 Mar 2017 14:34:18 -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 p185sm1812720wme.20.2017.03.22.14.34.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 14:34:17 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 6/6] mmc: meson-gx: simplify setting timeout configuration parameters To: Ulf Hansson , Kevin Hilman References: <8bf58a83-d8d7-615c-c89b-87a62a3c9c40@gmail.com> Message-ID: <8105b3e7-9c80-038e-9cfe-53139d6892ce@gmail.com> Date: Wed, 22 Mar 2017 22:34:01 +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_143438_602961_8690C604 X-CRM114-Status: UNSURE ( 8.69 ) X-CRM114-Notice: Please train this message. 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 We don't need variable cmd_cfg_timeout, so remove it and simplify the code a little. Signed-off-by: Heiner Kallweit --- drivers/mmc/host/meson-gx-mmc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 87303404..b917765c 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -426,7 +426,7 @@ 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; u32 cfg, cmd_cfg = 0, cmd_data = 0; - u8 blk_len, cmd_cfg_timeout; + u8 blk_len; unsigned int xfer_bytes = 0; /* Setup descriptors */ @@ -454,6 +454,9 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) /* data? */ if (data) { cmd_cfg |= CMD_CFG_DATA_IO; + cmd_cfg |= ilog2(SD_EMMC_CMD_TIMEOUT_DATA) << + CMD_CFG_TIMEOUT_SHIFT; + if (data->blocks > 1) { cmd_cfg |= CMD_CFG_BLOCK_MODE; cmd_cfg |= (data->blocks & CMD_CFG_LENGTH_MASK) << @@ -488,13 +491,9 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) } 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); + cmd_cfg |= ilog2(SD_EMMC_CMD_TIMEOUT) << CMD_CFG_TIMEOUT_SHIFT; } - cmd_cfg |= (cmd_cfg_timeout & CMD_CFG_TIMEOUT_MASK) << - CMD_CFG_TIMEOUT_SHIFT; host->cmd = cmd;