From patchwork Fri Sep 22 03:46:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 113949 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2797958qgf; Thu, 21 Sep 2017 20:49:07 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDXPs9KpG2gKymj0LkVPG30MasMCtr8QOQDHImUbZd/UtnrIZtgSo6kSWPVdRKnG+11ow4F X-Received: by 10.159.207.139 with SMTP id z11mr7546296plo.335.1506052147295; Thu, 21 Sep 2017 20:49:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506052147; cv=none; d=google.com; s=arc-20160816; b=sfYPPlVQC58SjgvGfkYk55Jpp1NF7lhtKvsicZSfVu8ZHs7bLaOui4i/0xDtZdUYVX n2QV0sAOHa3dw8xL9NdYpeMtgAsSZ/SE5H6Ir2c9fPsD16Uy+cQXooc7cNjaL7ZD8r9Q P1p9Yv+ZXzozS5cA0qi9fOIj6fMn5jqBglWQrMY3O/il5bEqok5w/z+fdb3qcMp9UYVq YJF98WH0tRZGJKFjkWZEYYjvNucYu38qTjOMEk9qWr8KLVLXix6rV2//mjVULyCdMzc7 GI4/I96Xu5YCn+5FUkvhry6vxMmSmUsvlKCgglZyfiG+owfWMVRSc4MSRHE+IkYy+iLn l6HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=ZsdAJUIqTO4KvPRvFWjKzBnNDptNNDtvB0GG9itOgS4=; b=qSre50E1IbQl7GmzCCKQXWdMcdnwr1DoXxl0/jJ5m6R9L+ZSuQhpbg/zIYr80lf3LX WxBesByBSbbTHs76g+AQtKF2lKl7ax6XmVJCC1mu4nOOScfmY2b3ZqJrkCq94NqvuPH9 4gvr4ZSktKeKtIoBtrn6NyM09rigFQJ3UuoaGk8LkUv9mZsuNhBOTsjwu1opGhCitCmz qHbN/2D+wuzPoIsLNUyuS/OOg0AFVXT4ZounnrzI/hlZkw1S8OqQiJyEp2cxnbTsYJnO omyj4meUXEMVK2SZBjni/wd9FwyJshUzZBiXSPyjNWJYEu4YczVAlL4S5zKz7ydR8KVJ tW4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vBp1cnQ+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s189si2055398pgb.737.2017.09.21.20.49.07; Thu, 21 Sep 2017 20:49:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vBp1cnQ+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751940AbdIVDtE (ORCPT + 26 others); Thu, 21 Sep 2017 23:49:04 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:59774 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbdIVDtC (ORCPT ); Thu, 21 Sep 2017 23:49:02 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v8M3kwAN029389; Fri, 22 Sep 2017 12:47:02 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v8M3kwAN029389 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1506052023; bh=ZsdAJUIqTO4KvPRvFWjKzBnNDptNNDtvB0GG9itOgS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vBp1cnQ+iWDOKqYY7s9ZsRHh6mW27je3By78zMfOOIKkkR5cedu2njXK+1X+USTIL eL/leQcw50ImY8wZsckuib44a23qilXhkzjKE7aardjk5P2TDuUmK2K+9a0bG7zswA Gw/jyNJe5LRuIOkDY5RVD98rCo+xTF8VG/NDwnCW9cXig7M3Xji0KpMYdOq4sPnIK8 5qIexWsTU3Dzz4bhhuT2lLwj12/RMZfehMKZITmgqd2Sq/YQKWZBWB9CzH9gVen2Gf mBNv/jV9tGP/Dn8smMv+3tMznpaMDnPBMnOplHTeFsNPKUqmbc0LcSjZq+kgs9ysox 47ALGfkzxyWOw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , Cyrille Pitchen , linux-kernel@vger.kernel.org, Boris Brezillon , Marek Vasut , Brian Norris , Richard Weinberger , David Woodhouse Subject: [PATCH v2 04/12] mtd: nand: denali: squash denali_enable_dma() helper into caller Date: Fri, 22 Sep 2017 12:46:41 +0900 Message-Id: <1506052009-8285-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506052009-8285-1-git-send-email-yamada.masahiro@socionext.com> References: <1506052009-8285-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This helper just sets/clears a flag of DMA_ENABLE register (with register read-back, I do not know why it is necessary). Move the register write code to the caller, and remove the helper. It works for me without the register read-back. Signed-off-by: Masahiro Yamada --- Changes in v2: None drivers/mtd/nand/denali.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 4daeb7f..e7b25de 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -465,13 +465,6 @@ static int denali_sw_ecc_fixup(struct mtd_info *mtd, return max_bitflips; } -/* programs the controller to either enable/disable DMA transfers */ -static void denali_enable_dma(struct denali_nand_info *denali, bool en) -{ - iowrite32(en ? DMA_ENABLE__FLAG : 0, denali->reg + DMA_ENABLE); - ioread32(denali->reg + DMA_ENABLE); -} - static void denali_setup_dma64(struct denali_nand_info *denali, dma_addr_t dma_addr, int page, int write) { @@ -619,7 +612,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf, ecc_err_mask = INTR__ECC_ERR; } - denali_enable_dma(denali, true); + iowrite32(DMA_ENABLE__FLAG, denali->reg + DMA_ENABLE); denali_reset_irq(denali); denali_setup_dma(denali, dma_addr, page, write); @@ -631,7 +624,8 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf, else if (irq_status & ecc_err_mask) ret = -EBADMSG; - denali_enable_dma(denali, false); + iowrite32(0, denali->reg + DMA_ENABLE); + dma_unmap_single(denali->dev, dma_addr, size, dir); if (irq_status & INTR__ERASED_PAGE)