From patchwork Wed Sep 13 05:20: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: 112403 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp535372qgf; Tue, 12 Sep 2017 22:23:19 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5dFjFzYkOXRzRFMQetZLMKDjlgadsqO5ROv6waAToLY9QWkK2/qSUcj1GF155Qs7CT/UPB X-Received: by 10.101.83.4 with SMTP id m4mr9358320pgq.266.1505280199049; Tue, 12 Sep 2017 22:23:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505280199; cv=none; d=google.com; s=arc-20160816; b=G3uvQYJWcf0JD/aDEwCBd2xdc+K8c6/EOvZZZAHxgHdVQi4+1kmkLVZT/Bx2PHoaRN HC3Cwt/9GMM1IOxMOIrj/j9NjL5+/SoPf3IUbNM7c9ooDLiiafElOD5uUVPgkTMNqvFq TtHbhPEK1pm8Luc2SEbrnbU2IxeXsR1haqQ9dnU1e3hwPkcDduBHgl1oGzJzE/o10AXN lx6rFwOqRtAI5it8xaGkwebuhBRq5kmoCSxzMvE59Nc58Vb+4WMzY70kvMX/N0CjbPCs I1Ju/JC9wikLsoONiSzqI7vgkejxfaWoAK+Zgzh3vPOqY8Kp+sx679hAcLq6Rm9CcFBq fBag== 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=UsmtvXFLh1VYoEpkB1cXxBkVIZ+LB34uuLv5OvakrN8=; b=YpGSwuPMpPZlk37xQWUo9+mW1KHSz3Cr2cW3uCobz4xAgRKOOsYOSeK4CWHSbP3VqC 4KpPNwmBml8Ix3xkWQsE8587MWjadHu1NMuaAhMDHf2beaWn7U/mM7rdnfvT7I/yARHC DH5NCl2Qq5fxfyQ8X0Lrp3HVRFiht8jvIjZK34wmCcma0Hi8sV84q7FOi70ge+yX4ccy UY+CO+UB8rh8VkxBj7/NNJGBNf29m3Be0DREmqdBXpYmYRsy0Xa0IwBg4wRUZr89cUrF Z2LSBiPsh80cCXuGrfgQVgUwr9N1s+xC16eYn+Qj+QLvbLzbUEh+VurkVxK6UeoGUs5r fQzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=mZ6PtYmJ; 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 u27si8980760pfa.361.2017.09.12.22.23.18; Tue, 12 Sep 2017 22:23:19 -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=mZ6PtYmJ; 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 S1751687AbdIMFXI (ORCPT + 26 others); Wed, 13 Sep 2017 01:23:08 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:35954 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751253AbdIMFW5 (ORCPT ); Wed, 13 Sep 2017 01:22:57 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v8D5Kpx3010397; Wed, 13 Sep 2017 14:20:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v8D5Kpx3010397 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1505280055; bh=UsmtvXFLh1VYoEpkB1cXxBkVIZ+LB34uuLv5OvakrN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mZ6PtYmJrwOigXUgsvjpM1aFePJUuGx/sO0NS+Yypni4k1EHPHUE0dPEeZxu5EZSZ Slz5jkXDNkadXk+DqtbeI9J0e6/gRnvXa2zzJLyq6gJtnY3gqdsqZ45xa6957S1B/M R2PXx3eCIUV50ulMXDHVk58vH6ioWB15ZYoZ9a+AQUScTD2W6koDJm4qQj/q8b4R8O yzZzvq1fI7lUO1+Tie0ZtYpxuUsjGCi8yABXy87uTgNg12NtXv1bLPwEFcuwZ/30vI FmHg0qTAGX9QVqhekmAOWDG7Ilbw9mP8WAWhM40D2roQ+F+WhRPi6wA5z6QtAnkSud +5LG3qSc3lPLA== 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 4/9] mtd: nand: denali: squash denali_enable_dma() helper into caller Date: Wed, 13 Sep 2017 14:20:41 +0900 Message-Id: <1505280046-16608-5-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505280046-16608-1-git-send-email-yamada.masahiro@socionext.com> References: <1505280046-16608-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 --- 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)